From 531b50cab6e42e6146a419bc71c5b494fff774b2 Mon Sep 17 00:00:00 2001
From: tuqin <tuqin@tuqin.cn>
Date: 星期二, 27 十月 2026 09:48:33 +0800
Subject: [PATCH] feat(hrm): 考勤规则支持 Excel 导入；修复定位打卡测试类编译错误
---
yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/attendance/HrmAttendanceRuleService.java | 21 ++++++++++++++++++---
1 files changed, 18 insertions(+), 3 deletions(-)
diff --git a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/attendance/HrmAttendanceRuleService.java b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/attendance/HrmAttendanceRuleService.java
index 69e9b70..25c18fe 100644
--- a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/attendance/HrmAttendanceRuleService.java
+++ b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/attendance/HrmAttendanceRuleService.java
@@ -61,12 +61,27 @@
List<HrmAttendanceRuleDO> getAttendanceRuleList();
/**
- * 鏍规嵁閮ㄩ棬ID鑾峰彇鑰冨嫟瑙勫垯
- * 浼樺厛鍖归厤閮ㄩ棬瑙勫垯锛屽叾娆℃煡鎵惧叏灞�瑙勫垯锛坉eptId=null锛�
+ * 鏍规嵁閮ㄩ棬ID + 鑰冨嫟鏃ユ湡鑾峰彇鐢熸晥鐨勮�冨嫟瑙勫垯
+ * 浼樺厛鍖归厤閮ㄩ棬瑙勫垯锛屽叾娆℃煡鎵惧叏灞�瑙勫垯锛坉eptId=null锛夛紱
+ * 鍚岄儴闂ㄥ瓨鍦ㄥ鏉¤鍒欐椂锛屽彇銆岀敓鏁堝紑濮嬫棩鏈熴�嶆渶鏅氫笖瑕嗙洊璇ユ棩鏈熺殑閭ｆ潯銆�
*
* @param deptId 閮ㄩ棬ID
+ * @param date 鑰冨嫟鏃ユ湡锛堜负绌烘椂鎸夊綋澶╋級
* @return 鑰冨嫟瑙勫垯
*/
- HrmAttendanceRuleDO getAttendanceRuleByDeptId(Long deptId);
+ HrmAttendanceRuleDO getAttendanceRuleByDeptId(Long deptId, java.time.LocalDate date);
+ /**
+ * 瀵煎叆鑰冨嫟瑙勫垯锛堢Щ妞嶈嚜鏂伴珮鐢靛姏锛�
+ *
+ * 鎸夈�岃鍒欏悕绉般�嶅垽閲嶏紱宸插瓨鍦ㄦ椂闇� updateSupport=true 鎵嶈鐩栥��
+ * 閮ㄩ棬鎸夊悕绉板尮閰嶏紝閮ㄩ棬涓虹┖琛ㄧず鍏ㄥ眬瑙勫垯銆�
+ *
+ * @param importList 瀵煎叆鐨勮鍒欏垪琛�
+ * @param importReqVO 瀵煎叆鍙傛暟
+ * @return 瀵煎叆缁撴灉
+ */
+ cn.iocoder.yudao.module.hrm.controller.admin.attendance.vo.HrmAttendanceRuleImportRespVO importAttendanceRuleList(
+ List<cn.iocoder.yudao.module.hrm.controller.admin.attendance.vo.HrmAttendanceRuleImportExcelVO> importList,
+ cn.iocoder.yudao.module.hrm.controller.admin.attendance.vo.HrmAttendanceRuleImportReqVO importReqVO);
}
\ No newline at end of file
--
Gitblit v1.9.3