From 1fd52d7784a8b0b963cf38d63175cdf9082e8f43 Mon Sep 17 00:00:00 2001
From: tuqin <tuqin@tuqin.cn>
Date: 星期二, 03 十一月 2026 19:40:39 +0800
Subject: [PATCH] fix(hrm): 薪酬核算按出勤天数联动扣款、个税配置可保存、离职提交报错
---
yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/attendance/HrmAttendanceRecordService.java | 19 ++++++++++++-------
1 files changed, 12 insertions(+), 7 deletions(-)
diff --git a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/attendance/HrmAttendanceRecordService.java b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/attendance/HrmAttendanceRecordService.java
index 73e8dd9..0c59517 100644
--- a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/attendance/HrmAttendanceRecordService.java
+++ b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/attendance/HrmAttendanceRecordService.java
@@ -1,6 +1,7 @@
package cn.iocoder.yudao.module.hrm.service.attendance;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.module.hrm.controller.admin.attendance.vo.HrmAttendanceClockReqVO;
import cn.iocoder.yudao.module.hrm.controller.admin.attendance.vo.HrmAttendanceRecordPageReqVO;
import cn.iocoder.yudao.module.hrm.dal.dataobject.attendance.HrmAttendanceRecordDO;
import cn.iocoder.yudao.module.hrm.dal.dataobject.attendance.HrmAttendanceExceptionDO;
@@ -48,20 +49,24 @@
*
* @param userId 鍛樺伐ID
* @param clockTime 鎵撳崱鏃堕棿
- * @param location 鎵撳崱鍦扮偣
- * @return 鑰冨嫟璁板綍
+ * @param reqVO 鍘熷瀹氫綅淇℃伅锛圵GS84锛�
+ * @param legacyLocation 鏃х増鍦扮偣鏂囨湰锛屼粎鍦ㄦ湭鍚敤浣嶇疆闄愬埗鏃跺吋瀹逛娇鐢�
+ * @return 鎵撳崱璁板綍銆佽鍒欏拰璺濈
*/
- HrmAttendanceRecordDO clockIn(Long userId, LocalDateTime clockTime, String location);
+ HrmAttendanceClockResult clockIn(Long userId, LocalDateTime clockTime,
+ HrmAttendanceClockReqVO reqVO, String legacyLocation);
/**
* 鎵撳崱锛堜笅鐝墦鍗★級
*
* @param userId 鍛樺伐ID
* @param clockTime 鎵撳崱鏃堕棿
- * @param location 鎵撳崱鍦扮偣
- * @return 鑰冨嫟璁板綍
+ * @param reqVO 鍘熷瀹氫綅淇℃伅锛圵GS84锛�
+ * @param legacyLocation 鏃х増鍦扮偣鏂囨湰锛屼粎鍦ㄦ湭鍚敤浣嶇疆闄愬埗鏃跺吋瀹逛娇鐢�
+ * @return 鎵撳崱璁板綍銆佽鍒欏拰璺濈
*/
- HrmAttendanceRecordDO clockOut(Long userId, LocalDateTime clockTime, String location);
+ HrmAttendanceClockResult clockOut(Long userId, LocalDateTime clockTime,
+ HrmAttendanceClockReqVO reqVO, String legacyLocation);
/**
* 琛ュ崱瀹℃壒閫氳繃鍚庢洿鏂拌�冨嫟璁板綍
@@ -80,4 +85,4 @@
cn.iocoder.yudao.module.hrm.controller.admin.attendance.vo.HrmAttendanceMyStatusRespVO
getMyStatus(Long loginUserId, LocalDate date);
-}
\ No newline at end of file
+}
--
Gitblit v1.9.3