From 43aab58c9ecb1203770ba382efbdbae299ca87ec Mon Sep 17 00:00:00 2001
From: liu <2021943741@qq.com>
Date: 星期一, 26 十月 2026 15:12:31 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_business' into dev_business
---
yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/attendance/HrmAttendanceRecordController.java | 90 +++++++++++++++++++++-----------------------
1 files changed, 43 insertions(+), 47 deletions(-)
diff --git a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/attendance/HrmAttendanceRecordController.java b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/attendance/HrmAttendanceRecordController.java
index bf2016d..0528f3e 100644
--- a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/attendance/HrmAttendanceRecordController.java
+++ b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/attendance/HrmAttendanceRecordController.java
@@ -7,8 +7,7 @@
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
-import cn.iocoder.yudao.module.hrm.controller.admin.attendance.vo.HrmAttendanceClockReqVO;
-import cn.iocoder.yudao.module.hrm.controller.admin.attendance.vo.HrmAttendanceClockRespVO;
+import cn.iocoder.yudao.framework.operatelog.core.util.OperateLogUtils;
import cn.iocoder.yudao.module.hrm.controller.admin.attendance.vo.HrmAttendanceMyStatusRespVO;
import cn.iocoder.yudao.module.hrm.controller.admin.attendance.vo.HrmAttendanceRecordImportExcelVO;
import cn.iocoder.yudao.module.hrm.controller.admin.attendance.vo.HrmAttendanceRecordImportReqVO;
@@ -16,24 +15,27 @@
import cn.iocoder.yudao.module.hrm.controller.admin.attendance.vo.HrmAttendanceRecordRespVO;
import cn.iocoder.yudao.module.hrm.dal.dataobject.attendance.HrmAttendanceRecordDO;
import cn.iocoder.yudao.module.hrm.dal.dataobject.employee.HrmEmployeeDO;
-import cn.iocoder.yudao.module.hrm.service.attendance.HrmAttendanceClockResult;
+import cn.iocoder.yudao.module.hrm.enums.HrmAttendanceClockTypeEnum;
import cn.iocoder.yudao.module.hrm.service.attendance.HrmAttendanceRecordService;
import cn.iocoder.yudao.module.hrm.service.employee.HrmEmployeeService;
import cn.iocoder.yudao.module.system.api.dept.DeptApi;
import cn.iocoder.yudao.module.system.api.dept.dto.DeptRespDTO;
import cn.iocoder.yudao.module.system.api.user.AdminUserApi;
import cn.iocoder.yudao.module.system.api.user.dto.AdminUserRespDTO;
+import com.mzt.logapi.starter.annotation.LogRecord;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.annotation.Resource;
import jakarta.servlet.http.HttpServletResponse;
import jakarta.validation.Valid;
+import org.springframework.format.annotation.DateTimeFormat;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import java.io.IOException;
+import java.time.LocalDate;
import java.time.LocalDateTime;
import java.util.*;
import java.util.stream.Collectors;
@@ -41,7 +43,9 @@
import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.EXPORT;
import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
+import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY;
import static cn.iocoder.yudao.module.hrm.enums.ErrorCodeConstants.EMPLOYEE_NOT_EXISTS;
+import static cn.iocoder.yudao.module.hrm.enums.LogRecordConstants.*;
@Tag(name = "绠＄悊鍚庡彴 - HRM 鑰冨嫟璁板綍")
@RestController
@@ -58,73 +62,54 @@
@Resource
private AdminUserApi adminUserApi;
- @GetMapping("/my-status")
- @Operation(summary = "鑾峰彇鎴戠殑浠婃棩鎵撳崱鐘舵��")
- @PreAuthorize("@ss.hasPermission('hrm:attendance-record:clock')")
- public CommonResult<HrmAttendanceMyStatusRespVO> getMyStatus() {
- HrmEmployeeDO employee = employeeService.getEmployeeByUserId(getLoginUserId());
- if (employee == null) {
- // 鏈叧鑱斿憳宸ユ椂杩斿洖 null锛岀敱鍓嶇鎻愮ず锛岄伩鍏嶆墦鍗￠〉鍔犺浇鐩存帴鎶ラ敊
- return success(null);
- }
- return success(attendanceRecordService.getMyStatus(employee.getId()));
- }
-
@PostMapping("/clock-in")
@Operation(summary = "涓婄彮鎵撳崱")
- @PreAuthorize("@ss.hasPermission('hrm:attendance-record:clock')")
- @ApiAccessLog(requestEnable = false)
- public CommonResult<HrmAttendanceClockRespVO> clockIn(
- @Valid @RequestBody(required = false) HrmAttendanceClockReqVO reqVO,
- @RequestParam(value = "location", required = false) String legacyLocation) {
+ public CommonResult<HrmAttendanceRecordRespVO> clockIn(@RequestParam("location") String location) {
Long loginUserId = getLoginUserId();
HrmEmployeeDO employee = employeeService.getEmployeeByUserId(loginUserId);
if (employee == null) {
- throw exception(EMPLOYEE_NOT_EXISTS, "褰撳墠鐢ㄦ埛鏈叧鑱斿憳宸ヤ俊鎭紝鏃犳硶鎵撳崱");
+ throw exception(EMPLOYEE_NOT_EXISTS,
+ "褰撳墠鐧诲綍璐﹀彿鏈叧鑱斿憳宸ユ。妗堬紝鏃犳硶鎵撳崱銆傝鑱旂郴绠＄悊鍛樺湪銆愬憳宸ョ鐞嗐�戜腑灏嗚鐧诲綍璐﹀彿缁戝畾鍒板憳宸ャ��");
}
- HrmAttendanceClockResult result = attendanceRecordService.clockIn(
- employee.getId(), LocalDateTime.now(), reqVO, legacyLocation);
- return success(buildClockResultVO(result, employee));
+ HrmAttendanceRecordDO record = attendanceRecordService.clockIn(employee.getId(), LocalDateTime.now(), location);
+ return success(buildClockRespVO(record, employee));
}
@PostMapping("/clock-out")
@Operation(summary = "涓嬬彮鎵撳崱")
- @PreAuthorize("@ss.hasPermission('hrm:attendance-record:clock')")
- @ApiAccessLog(requestEnable = false)
- public CommonResult<HrmAttendanceClockRespVO> clockOut(
- @Valid @RequestBody(required = false) HrmAttendanceClockReqVO reqVO,
- @RequestParam(value = "location", required = false) String legacyLocation) {
+ public CommonResult<HrmAttendanceRecordRespVO> clockOut(@RequestParam("location") String location) {
Long loginUserId = getLoginUserId();
HrmEmployeeDO employee = employeeService.getEmployeeByUserId(loginUserId);
if (employee == null) {
- throw exception(EMPLOYEE_NOT_EXISTS, "褰撳墠鐢ㄦ埛鏈叧鑱斿憳宸ヤ俊鎭紝鏃犳硶鎵撳崱");
+ throw exception(EMPLOYEE_NOT_EXISTS,
+ "褰撳墠鐧诲綍璐﹀彿鏈叧鑱斿憳宸ユ。妗堬紝鏃犳硶鎵撳崱銆傝鑱旂郴绠＄悊鍛樺湪銆愬憳宸ョ鐞嗐�戜腑灏嗚鐧诲綍璐﹀彿缁戝畾鍒板憳宸ャ��");
}
- HrmAttendanceClockResult result = attendanceRecordService.clockOut(
- employee.getId(), LocalDateTime.now(), reqVO, legacyLocation);
- return success(buildClockResultVO(result, employee));
+ HrmAttendanceRecordDO record = attendanceRecordService.clockOut(employee.getId(), LocalDateTime.now(), location);
+ return success(buildClockRespVO(record, employee));
}
+ @GetMapping("/my-status")
+ @Operation(summary = "鑾峰緱褰撳墠鐧诲綍浜虹殑鑰冨嫟鐘舵��")
+ @Parameter(name = "date", description = "鑰冨嫟鏃ユ湡锛屾牸寮� yyyy-MM-dd锛岄粯璁ゆ湇鍔″櫒褰撳ぉ", example = "2026-10-17")
+ public CommonResult<HrmAttendanceMyStatusRespVO> getMyStatus(
+ @RequestParam(value = "date", required = false)
+ @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY) LocalDate date) {
+ return success(attendanceRecordService.getMyStatus(getLoginUserId(), date));
+ }
+
+ /**
+ * 鏋勫缓鎵撳崱杩斿洖 VO锛屽瓧娈典笌 my-status.record 淇濇寔涓�鑷�
+ */
private HrmAttendanceRecordRespVO buildClockRespVO(HrmAttendanceRecordDO record, HrmEmployeeDO employee) {
HrmAttendanceRecordRespVO respVO = BeanUtils.toBean(record, HrmAttendanceRecordRespVO.class);
+ respVO.setClockInTypeName(HrmAttendanceClockTypeEnum.getNameByType(record.getClockInType()));
+ respVO.setClockOutTypeName(HrmAttendanceClockTypeEnum.getNameByType(record.getClockOutType()));
respVO.setUserName(employee.getName());
if (record.getDeptId() != null) {
DeptRespDTO dept = deptApi.getDept(record.getDeptId());
if (dept != null) {
respVO.setDeptName(dept.getName());
}
- }
- return respVO;
- }
-
- private HrmAttendanceClockRespVO buildClockResultVO(HrmAttendanceClockResult result,
- HrmEmployeeDO employee) {
- HrmAttendanceClockRespVO respVO = new HrmAttendanceClockRespVO();
- respVO.setRecord(buildClockRespVO(result.record(), employee));
- respVO.setLocationName(result.rule().getLocationName());
- if (Boolean.TRUE.equals(result.rule().getLocationRequired())) {
- respVO.setDistanceMeters(result.distanceMeters());
- respVO.setRadiusMeters(result.rule().getRadiusMeters());
- respVO.setWithinRange(true);
}
return respVO;
}
@@ -237,12 +222,18 @@
@PostMapping("/import")
@Operation(summary = "瀵煎叆鑰冨嫟璁板綍")
@PreAuthorize("@ss.hasPermission('hrm:attendance-record:import')")
+ @LogRecord(type = HRM_ATTENDANCE_RECORD_TYPE, subType = HRM_ATTENDANCE_RECORD_IMPORT_SUB_TYPE, bizNo = "0",
+ success = HRM_ATTENDANCE_RECORD_IMPORT_SUCCESS)
public CommonResult<String> importExcel(@Valid HrmAttendanceRecordImportReqVO importReqVO) throws IOException {
List<HrmAttendanceRecordImportExcelVO> list = ExcelUtils.read(importReqVO.getFile(), HrmAttendanceRecordImportExcelVO.class);
if (CollUtil.isEmpty(list)) {
+ // 璁板綍瀵煎叆缁撴灉姹囨�伙紝渚� @LogRecord 鐨� success 鏂囨寮曠敤
+ OperateLogUtils.putImportSummary(0, null, null);
return success("娌℃湁鍙鍏ョ殑鏁版嵁");
}
int successCount = 0;
+ int createCount = 0; // 鏂板鐨勮褰曟暟
+ int updateCount = 0; // 鏇存柊鐨勮褰曟暟锛堜粎鍕鹃�夈�屾敮鎸佹洿鏂般�嶆椂鎵嶄細璧版洿鏂帮級
Set<String> missingNames = new LinkedHashSet<>();
Set<String> duplicateNames = new LinkedHashSet<>();
Set<String> invalidRows = new LinkedHashSet<>();
@@ -288,6 +279,7 @@
.location(item.getLocation()).remark(item.getRemark())
.dataSource(2).build();
attendanceRecordService.createImportedRecord(record);
+ createCount++;
} else if (Boolean.TRUE.equals(importReqVO.getUpdateSupport())) {
record.setClockInTime(item.getClockInTime());
record.setClockOutTime(item.getClockOutTime());
@@ -296,6 +288,7 @@
record.setLocation(item.getLocation());
record.setRemark(item.getRemark());
attendanceRecordService.updateImportedRecord(record);
+ updateCount++;
}
successCount++;
}
@@ -309,6 +302,9 @@
if (!invalidRows.isEmpty()) {
msg.append("锛涗互涓嬭褰曟暟鎹笉瀹屾暣锛屾湭鑳藉鍏ワ細").append(String.join("銆�", invalidRows));
}
+ // 璁板綍瀵煎叆缁撴灉姹囨�伙紝渚� @LogRecord 鐨� success 鏂囨寮曠敤
+ OperateLogUtils.putImportSummary(createCount, updateCount,
+ missingNames.size() + duplicateNames.size() + invalidRows.size());
return success(msg.toString());
}
@@ -330,4 +326,4 @@
ExcelUtils.write(response, "鑰冨嫟璁板綍.xls", "鏁版嵁", HrmAttendanceRecordRespVO.class, list);
}
-}
+}
\ No newline at end of file
--
Gitblit v1.9.3