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/service/attendance/HrmAttendanceRecordService.java | 36 ++++++++++++++++--------------------
1 files changed, 16 insertions(+), 20 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 2d10ac7..184295a 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,7 +1,6 @@
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.HrmAttendanceMyStatusRespVO;
import cn.iocoder.yudao.module.hrm.controller.admin.attendance.vo.HrmAttendanceRecordPageReqVO;
import cn.iocoder.yudao.module.hrm.dal.dataobject.attendance.HrmAttendanceRecordDO;
@@ -39,6 +38,15 @@
*/
HrmAttendanceRecordDO getAttendanceRecordByUserIdAndDate(Long userId, LocalDate date);
+ /**
+ * 鑾峰緱褰撳墠鐧诲綍浜虹殑鑰冨嫟鐘舵�侊細鑰冨嫟瑙勫垯 + 鎸囧畾鏃ユ湡鐨勬墦鍗＄姸鎬�
+ *
+ * @param loginUserId 鐧诲綍鐢ㄦ埛ID锛堢郴缁熺敤鎴稩D锛屼笉鏄憳宸D锛�
+ * @param date 鑰冨嫟鏃ユ湡锛屼负绌烘椂鍙栨湇鍔″櫒褰撳ぉ
+ * @return 鎴戠殑鑰冨嫟鐘舵��
+ */
+ HrmAttendanceMyStatusRespVO getMyStatus(Long loginUserId, LocalDate date);
+
/** 鍒涘缓瀵煎叆鐨勮�冨嫟璁板綍 */
void createImportedRecord(HrmAttendanceRecordDO record);
@@ -50,32 +58,20 @@
*
* @param userId 鍛樺伐ID
* @param clockTime 鎵撳崱鏃堕棿
- * @param reqVO 鍘熷瀹氫綅淇℃伅锛圵GS84锛�
- * @param legacyLocation 鏃х増鍦扮偣鏂囨湰锛屼粎鍦ㄦ湭鍚敤浣嶇疆闄愬埗鏃跺吋瀹逛娇鐢�
- * @return 鎵撳崱璁板綍銆佽鍒欏拰璺濈
+ * @param location 鎵撳崱鍦扮偣
+ * @return 鑰冨嫟璁板綍
*/
- HrmAttendanceClockResult clockIn(Long userId, LocalDateTime clockTime,
- HrmAttendanceClockReqVO reqVO, String legacyLocation);
+ HrmAttendanceRecordDO clockIn(Long userId, LocalDateTime clockTime, String location);
/**
* 鎵撳崱锛堜笅鐝墦鍗★級
*
* @param userId 鍛樺伐ID
* @param clockTime 鎵撳崱鏃堕棿
- * @param reqVO 鍘熷瀹氫綅淇℃伅锛圵GS84锛�
- * @param legacyLocation 鏃х増鍦扮偣鏂囨湰锛屼粎鍦ㄦ湭鍚敤浣嶇疆闄愬埗鏃跺吋瀹逛娇鐢�
- * @return 鎵撳崱璁板綍銆佽鍒欏拰璺濈
+ * @param location 鎵撳崱鍦扮偣
+ * @return 鑰冨嫟璁板綍
*/
- HrmAttendanceClockResult clockOut(Long userId, LocalDateTime clockTime,
- HrmAttendanceClockReqVO reqVO, String legacyLocation);
-
- /**
- * 鑾峰彇鍛樺伐浠婃棩鎵撳崱鐘舵��
- *
- * @param userId 鍛樺伐ID
- * @return 浠婃棩鎵撳崱鐘舵�侊紝鍛樺伐涓嶅瓨鍦ㄦ椂杩斿洖 null
- */
- HrmAttendanceMyStatusRespVO getMyStatus(Long userId);
+ HrmAttendanceRecordDO clockOut(Long userId, LocalDateTime clockTime, String location);
/**
* 琛ュ崱瀹℃壒閫氳繃鍚庢洿鏂拌�冨嫟璁板綍
@@ -84,4 +80,4 @@
*/
void supplementClockIn(HrmAttendanceExceptionDO exception);
-}
+}
\ No newline at end of file
--
Gitblit v1.9.3