From 82155dd6f2b16fbfb718e636a54e2c9dae31246b Mon Sep 17 00:00:00 2001
From: liu <2021943741@qq.com>
Date: 星期五, 30 十月 2026 20:23:20 +0800
Subject: [PATCH] feat(hrm,bi): 移植长辉电力的考勤请假联动与 BI 大屏图表
---
yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/attendance/HrmAttendanceRecordController.java | 33 +++++++--------------------------
1 files changed, 7 insertions(+), 26 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 7908530..735cc69 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
@@ -9,7 +9,6 @@
import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
import cn.iocoder.yudao.framework.operatelog.core.util.OperateLogUtils;
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.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;
@@ -47,7 +46,7 @@
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.ErrorCodeConstants.ATTENDANCE_EMPLOYEE_NOT_BOUND;
import static cn.iocoder.yudao.module.hrm.enums.LogRecordConstants.*;
@Tag(name = "绠＄悊鍚庡彴 - HRM 鑰冨嫟璁板綍")
@@ -67,44 +66,39 @@
@PostMapping("/clock-in")
@Operation(summary = "涓婄彮鎵撳崱")
- @PreAuthorize("@ss.hasPermission('hrm:attendance-record:clock')")
@ApiAccessLog(requestEnable = false)
- public CommonResult<HrmAttendanceClockRespVO> clockIn(
+ public CommonResult<HrmAttendanceRecordRespVO> clockIn(
@Valid @RequestBody(required = false) HrmAttendanceClockReqVO reqVO,
@RequestParam(value = "location", required = false) String legacyLocation) {
Long loginUserId = getLoginUserId();
HrmEmployeeDO employee = employeeService.getEmployeeByUserId(loginUserId);
if (employee == null) {
- throw exception(EMPLOYEE_NOT_EXISTS,
- "褰撳墠鐧诲綍璐﹀彿鏈叧鑱斿憳宸ユ。妗堬紝鏃犳硶鎵撳崱銆傝鑱旂郴绠＄悊鍛樺湪銆愬憳宸ョ鐞嗐�戜腑灏嗚鐧诲綍璐﹀彿缁戝畾鍒板憳宸ャ��");
+ throw exception(ATTENDANCE_EMPLOYEE_NOT_BOUND);
}
HrmAttendanceClockResult result = attendanceRecordService.clockIn(
employee.getId(), LocalDateTime.now(), reqVO, legacyLocation);
- return success(buildClockResultVO(result, employee));
+ return success(buildClockRespVO(result.record(), employee));
}
@PostMapping("/clock-out")
@Operation(summary = "涓嬬彮鎵撳崱")
- @PreAuthorize("@ss.hasPermission('hrm:attendance-record:clock')")
@ApiAccessLog(requestEnable = false)
- public CommonResult<HrmAttendanceClockRespVO> clockOut(
+ public CommonResult<HrmAttendanceRecordRespVO> clockOut(
@Valid @RequestBody(required = false) HrmAttendanceClockReqVO reqVO,
@RequestParam(value = "location", required = false) String legacyLocation) {
Long loginUserId = getLoginUserId();
HrmEmployeeDO employee = employeeService.getEmployeeByUserId(loginUserId);
if (employee == null) {
- throw exception(EMPLOYEE_NOT_EXISTS,
- "褰撳墠鐧诲綍璐﹀彿鏈叧鑱斿憳宸ユ。妗堬紝鏃犳硶鎵撳崱銆傝鑱旂郴绠＄悊鍛樺湪銆愬憳宸ョ鐞嗐�戜腑灏嗚鐧诲綍璐﹀彿缁戝畾鍒板憳宸ャ��");
+ throw exception(ATTENDANCE_EMPLOYEE_NOT_BOUND);
}
HrmAttendanceClockResult result = attendanceRecordService.clockOut(
employee.getId(), LocalDateTime.now(), reqVO, legacyLocation);
- return success(buildClockResultVO(result, employee));
+ return success(buildClockRespVO(result.record(), employee));
}
@GetMapping("/my-status")
@Operation(summary = "鑾峰緱褰撳墠鐧诲綍浜虹殑鑰冨嫟鐘舵��")
@Parameter(name = "date", description = "鑰冨嫟鏃ユ湡锛屾牸寮� yyyy-MM-dd锛岄粯璁ゆ湇鍔″櫒褰撳ぉ", example = "2026-10-17")
- @PreAuthorize("@ss.hasPermission('hrm:attendance-record:clock')")
public CommonResult<HrmAttendanceMyStatusRespVO> getMyStatus(
@RequestParam(value = "date", required = false)
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY) LocalDate date) {
@@ -124,19 +118,6 @@
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;
}
--
Gitblit v1.9.3