From d206afe19ea77303a1f3dc50aa80caaf09612693 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期日, 18 十月 2026 08:40:58 +0800
Subject: [PATCH] feat(hrm): 同步考勤打卡能力到北方科技
---
yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/attendance/HrmAttendanceRuleServiceImpl.java | 29 ++++++++++++++++++++++-------
1 files changed, 22 insertions(+), 7 deletions(-)
diff --git a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/attendance/HrmAttendanceRuleServiceImpl.java b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/attendance/HrmAttendanceRuleServiceImpl.java
index 15c6391..373c401 100644
--- a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/attendance/HrmAttendanceRuleServiceImpl.java
+++ b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/attendance/HrmAttendanceRuleServiceImpl.java
@@ -8,6 +8,8 @@
import cn.iocoder.yudao.module.hrm.controller.admin.attendance.vo.HrmAttendanceRuleSaveReqVO;
import cn.iocoder.yudao.module.hrm.dal.dataobject.attendance.HrmAttendanceRuleDO;
import cn.iocoder.yudao.module.hrm.dal.mysql.attendance.HrmAttendanceRuleMapper;
+import cn.iocoder.yudao.module.system.api.dept.DeptApi;
+import cn.iocoder.yudao.module.system.api.dept.dto.DeptRespDTO;
import jakarta.annotation.Resource;
import org.springframework.stereotype.Service;
import org.springframework.validation.annotation.Validated;
@@ -17,7 +19,9 @@
import java.time.LocalDateTime;
import java.time.LocalTime;
import java.util.Comparator;
+import java.util.HashSet;
import java.util.List;
+import java.util.Set;
import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
import static cn.iocoder.yudao.module.hrm.enums.ErrorCodeConstants.*;
@@ -36,6 +40,8 @@
@Resource
private HrmAttendanceRuleMapper attendanceRuleMapper;
+ @Resource
+ private DeptApi deptApi;
@Override
public Long createAttendanceRule(HrmAttendanceRuleSaveReqVO createReqVO) {
@@ -117,17 +123,26 @@
@Override
public HrmAttendanceRuleDO getAttendanceRuleByDeptId(Long deptId, LocalDateTime clockTime) {
- // 1. 鍏堟煡鎵鹃儴闂ㄤ笓灞炶鍒欙紙鍚屼竴涓儴闂ㄥ彲浠ラ厤缃鏉★紝鐢ㄤ簬澶氱彮娆★級
- List<HrmAttendanceRuleDO> deptRules = attendanceRuleMapper.selectList(new LambdaQueryWrapperX<HrmAttendanceRuleDO>()
- .eq(HrmAttendanceRuleDO::getDeptId, deptId)
- .eq(HrmAttendanceRuleDO::getStatus, ENABLED_STATUS));
- if (!deptRules.isEmpty()) {
- return matchRuleByClockTime(deptRules, clockTime);
+ // 1. 浠庡憳宸ユ墍鍦ㄩ儴闂ㄥ紑濮嬮�愮骇鍚戜笂鏌ユ壘锛氶厤缃湪涓婄骇閮ㄩ棬鐨勮鍒欏鍏跺瓙閮ㄩ棬鐢熸晥
+ Set<Long> visitedDeptIds = new HashSet<>();
+ Long currentDeptId = deptId;
+ while (currentDeptId != null && currentDeptId != 0 && visitedDeptIds.add(currentDeptId)) {
+ List<HrmAttendanceRuleDO> deptRules = attendanceRuleMapper.selectEnabledListByDeptId(currentDeptId);
+ if (!deptRules.isEmpty()) {
+ // 鍚屼竴閮ㄩ棬鍙厤缃鏉¤鍒欙紙澶氱彮娆★級锛屾寜鎵撳崱鏃堕棿鍖归厤鐝
+ return matchRuleByClockTime(deptRules, clockTime);
+ }
+ DeptRespDTO dept = deptApi.getDept(currentDeptId);
+ if (dept == null) {
+ break;
+ }
+ currentDeptId = dept.getParentId();
}
// 2. 鏌ユ壘鍏ㄥ眬瑙勫垯锛坉eptId 涓� null锛�
List<HrmAttendanceRuleDO> globalRules = attendanceRuleMapper.selectList(new LambdaQueryWrapperX<HrmAttendanceRuleDO>()
.isNull(HrmAttendanceRuleDO::getDeptId)
- .eq(HrmAttendanceRuleDO::getStatus, ENABLED_STATUS));
+ .eq(HrmAttendanceRuleDO::getStatus, ENABLED_STATUS)
+ .orderByDesc(HrmAttendanceRuleDO::getId));
if (!globalRules.isEmpty()) {
return matchRuleByClockTime(globalRules, clockTime);
}
--
Gitblit v1.9.3