From 52feee3e55403d2858da59605173ec055f601bfa Mon Sep 17 00:00:00 2001
From: tuqin <tuqin@tuqin.cn>
Date: 星期六, 24 十月 2026 19:47:25 +0800
Subject: [PATCH] feat(hrm): 同步新疆中亿装配的人力资源模块到北方科技
---
yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/attendance/HrmAttendanceRuleServiceImpl.java | 125 ++++++++++++++++-------------------------
1 files changed, 48 insertions(+), 77 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..3421f76 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
@@ -3,7 +3,6 @@
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
-import com.google.common.annotations.VisibleForTesting;
import cn.iocoder.yudao.module.hrm.controller.admin.attendance.vo.HrmAttendanceRulePageReqVO;
import cn.iocoder.yudao.module.hrm.controller.admin.attendance.vo.HrmAttendanceRuleSaveReqVO;
import cn.iocoder.yudao.module.hrm.dal.dataobject.attendance.HrmAttendanceRuleDO;
@@ -13,10 +12,7 @@
import org.springframework.validation.annotation.Validated;
import java.math.BigDecimal;
-import java.time.Duration;
-import java.time.LocalDateTime;
-import java.time.LocalTime;
-import java.util.Comparator;
+import java.time.LocalDate;
import java.util.List;
import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
@@ -25,23 +21,23 @@
/**
* 鑰冨嫟瑙勫垯閰嶇疆 Service 瀹炵幇绫�
*
+ * 璇存槑锛氬悓涓�閮ㄩ棬鍏佽閰嶇疆澶氭潯瑙勫垯锛屾寜銆岀敓鏁堝紑濮嬫棩鏈� / 鐢熸晥缁撴潫鏃ユ湡銆嶅尯闂村尯鍒嗭紱
+ * 鍖归厤鏃跺彇瑕嗙洊鐩爣鏃ユ湡銆佷笖鐢熸晥寮�濮嬫棩鏈熸渶鏅氱殑閭ｆ潯锛堟棤鏃ユ湡鐨勮涓洪暱鏈熸湁鏁堬紝浼樺厛绾ф渶浣庯級銆�
+ *
* @author 瓒呯骇绠＄悊鍛�
*/
@Service
@Validated
public class HrmAttendanceRuleServiceImpl implements HrmAttendanceRuleService {
- /** 瑙勫垯鐘舵�侊細0-鍚敤 */
- private static final Integer ENABLED_STATUS = 0;
-
@Resource
private HrmAttendanceRuleMapper attendanceRuleMapper;
@Override
public Long createAttendanceRule(HrmAttendanceRuleSaveReqVO createReqVO) {
- // 鏍￠獙瑙勫垯鍚嶇О鏄惁閲嶅
+ // 鏍￠獙瑙勫垯鍚嶇О鏄惁閲嶅锛堝悓涓�閮ㄩ棬鍏佽澶氭潯瑙勫垯锛屼笉鍐嶉檺鍒堕儴闂ㄥ敮涓�锛�
validateAttendanceRuleNameUnique(null, createReqVO.getName());
- // 娉細鍚屼竴涓儴闂ㄥ厑璁搁厤缃鏉¤鍒欙紙澶氱彮娆★級锛岃繖閲屼笉鍐嶆牎楠岄儴闂ㄥ敮涓�
+ validateEffectiveDateRange(createReqVO.getEffectiveStartDate(), createReqVO.getEffectiveEndDate());
HrmAttendanceRuleDO attendanceRule = BeanUtils.toBean(createReqVO, HrmAttendanceRuleDO.class);
// 璁剧疆榛樿鍊�
if (attendanceRule.getLateAllowMinutes() == null) {
@@ -65,7 +61,7 @@
validateAttendanceRuleExists(updateReqVO.getId());
// 鏍￠獙瑙勫垯鍚嶇О鏄惁閲嶅
validateAttendanceRuleNameUnique(updateReqVO.getId(), updateReqVO.getName());
- // 娉細鍚屼竴涓儴闂ㄥ厑璁搁厤缃鏉¤鍒欙紙澶氱彮娆★級锛岃繖閲屼笉鍐嶆牎楠岄儴闂ㄥ敮涓�
+ validateEffectiveDateRange(updateReqVO.getEffectiveStartDate(), updateReqVO.getEffectiveEndDate());
HrmAttendanceRuleDO updateObj = BeanUtils.toBean(updateReqVO, HrmAttendanceRuleDO.class);
attendanceRuleMapper.updateById(updateObj);
}
@@ -95,6 +91,15 @@
}
}
+ /**
+ * 鏍￠獙鐢熸晥鏃ユ湡鍖洪棿锛氬紑濮嬫棩鏈熶笉鑳芥櫄浜庣粨鏉熸棩鏈�
+ */
+ private void validateEffectiveDateRange(LocalDate startDate, LocalDate endDate) {
+ if (startDate != null && endDate != null && startDate.isAfter(endDate)) {
+ throw exception(ATTENDANCE_RULE_EFFECTIVE_DATE_INVALID);
+ }
+ }
+
@Override
public HrmAttendanceRuleDO getAttendanceRule(Long id) {
return attendanceRuleMapper.selectById(id);
@@ -111,81 +116,47 @@
}
@Override
- public HrmAttendanceRuleDO getAttendanceRuleByDeptId(Long deptId) {
- return getAttendanceRuleByDeptId(deptId, null);
- }
-
- @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);
+ public HrmAttendanceRuleDO getAttendanceRuleByDeptId(Long deptId, LocalDate date) {
+ LocalDate targetDate = date != null ? date : LocalDate.now();
+ // 1. 鍏堟煡鎵鹃儴闂ㄤ笓灞炶鍒欙紙瑕嗙洊鐩爣鏃ユ湡鐨勶紝鐢熸晥寮�濮嬫棩鏈熸渶鏅氱殑浼樺厛锛�
+ if (deptId != null) {
+ List<HrmAttendanceRuleDO> deptRules = selectEffectiveRules(deptId, targetDate);
+ if (!deptRules.isEmpty()) {
+ return deptRules.get(0);
+ }
}
// 2. 鏌ユ壘鍏ㄥ眬瑙勫垯锛坉eptId 涓� null锛�
- List<HrmAttendanceRuleDO> globalRules = attendanceRuleMapper.selectList(new LambdaQueryWrapperX<HrmAttendanceRuleDO>()
- .isNull(HrmAttendanceRuleDO::getDeptId)
- .eq(HrmAttendanceRuleDO::getStatus, ENABLED_STATUS));
+ List<HrmAttendanceRuleDO> globalRules = selectEffectiveRules(null, targetDate);
if (!globalRules.isEmpty()) {
- return matchRuleByClockTime(globalRules, clockTime);
+ return globalRules.get(0);
}
return null;
}
/**
- * 澶氭潯瑙勫垯锛堝悓涓�涓儴闂ㄥ鐝锛夋椂锛屾寜鎵撳崱鏃堕棿閫夌彮娆★細
- * 1. 鎵撳崱鏃堕棿钀藉湪鏌愪釜鐝鐨� [涓婄彮鏃堕棿, 涓嬬彮鏃堕棿] 鍐咃紝灏卞彇杩欎竴鏉�
- * 2. 閮戒笉鍦ㄧ獥鍙ｅ唴鏃讹紝鍙栫彮娆℃椂闂寸獥鍙ｇ鎵撳崱鏃堕棿鏈�杩戠殑涓�鏉�
- * 3. 浠嶇劧骞跺垪鏃讹紝鎸変笂鐝椂闂淬�佺紪鍙锋帓搴忥紝淇濊瘉缁撴灉绋冲畾锛堜笉浼氶殢鏁版嵁搴撹繑鍥為『搴忔紓绉伙級
- * 鎵撳崱鏃堕棿涓虹┖锛堜笉鍏冲績鐝锛夋椂锛屽彇涓婄彮鏃堕棿鏈�鏃╃殑涓�鏉°��
+ * 鏌ヨ鍦ㄦ寚瀹氭棩鏈熺敓鏁堢殑瑙勫垯
+ *
+ * @param deptId 閮ㄩ棬ID锛宯ull 琛ㄧず鍏ㄥ眬瑙勫垯
+ * @param date 鐩爣鏃ユ湡
*/
- @VisibleForTesting
- static HrmAttendanceRuleDO matchRuleByClockTime(List<HrmAttendanceRuleDO> rules, LocalDateTime clockTime) {
- if (rules.size() == 1) {
- return rules.get(0);
+ private List<HrmAttendanceRuleDO> selectEffectiveRules(Long deptId, LocalDate date) {
+ LambdaQueryWrapperX<HrmAttendanceRuleDO> wrapper = new LambdaQueryWrapperX<>();
+ if (deptId == null) {
+ wrapper.isNull(HrmAttendanceRuleDO::getDeptId);
+ } else {
+ wrapper.eq(HrmAttendanceRuleDO::getDeptId, deptId);
}
- if (clockTime == null) {
- return rules.stream().min(Comparator
- .comparing(HrmAttendanceRuleDO::getWorkStartTime,
- Comparator.nullsLast(Comparator.<LocalTime>naturalOrder()))
- .thenComparing(HrmAttendanceRuleDO::getId))
- .orElse(rules.get(0));
- }
- LocalTime time = clockTime.toLocalTime();
- return rules.stream().min(Comparator
- .comparingLong((HrmAttendanceRuleDO rule) -> minutesToRuleWindow(rule, time))
- .thenComparing(HrmAttendanceRuleDO::getWorkStartTime,
- Comparator.nullsLast(Comparator.<LocalTime>naturalOrder()))
- .thenComparing(HrmAttendanceRuleDO::getId))
- .orElse(rules.get(0));
+ wrapper.eq(HrmAttendanceRuleDO::getStatus, 0);
+ // 鐢熸晥寮�濮嬫棩鏈熶负绌猴紙涓嶉檺锛夋垨 <= 鐩爣鏃ユ湡
+ wrapper.and(w -> w.isNull(HrmAttendanceRuleDO::getEffectiveStartDate)
+ .or().le(HrmAttendanceRuleDO::getEffectiveStartDate, date));
+ // 鐢熸晥缁撴潫鏃ユ湡涓虹┖锛堜笉闄愶級鎴� >= 鐩爣鏃ユ湡
+ wrapper.and(w -> w.isNull(HrmAttendanceRuleDO::getEffectiveEndDate)
+ .or().ge(HrmAttendanceRuleDO::getEffectiveEndDate, date));
+ // 鐢熸晥寮�濮嬫棩鏈熻秺鏅氫紭鍏堢骇瓒婇珮锛涘悓寮�濮嬫棩鏈熸椂鍙栧厛鍒涘缓鐨�
+ wrapper.orderByDesc(HrmAttendanceRuleDO::getEffectiveStartDate);
+ wrapper.orderByAsc(HrmAttendanceRuleDO::getId);
+ return attendanceRuleMapper.selectList(wrapper);
}
- /**
- * 鎵撳崱鏃堕棿鍒拌鍒欑彮娆＄獥鍙ｇ殑璺濈锛堝垎閽燂級锛氳惤鍦ㄧ獥鍙ｅ唴涓� 0锛岀彮娆℃椂闂存湭閰嶇疆鏃惰涓烘渶澶с��
- * 鏀寔璺ㄥぉ鐝锛堝 22:00-06:00锛屽彧瑕� end <= start 灏辨寜璺ㄥぉ澶勭悊锛夈��
- */
- private static long minutesToRuleWindow(HrmAttendanceRuleDO rule, LocalTime time) {
- LocalTime start = rule.getWorkStartTime();
- LocalTime end = rule.getWorkEndTime();
- if (start == null || end == null) {
- return Long.MAX_VALUE;
- }
- boolean crossDay = !end.isAfter(start);
- boolean inWindow = crossDay
- ? !time.isBefore(start) || !time.isAfter(end)
- : !time.isBefore(start) && !time.isAfter(end);
- if (inWindow) {
- return 0;
- }
- return Math.min(minutesBetween(time, start), minutesBetween(time, end));
- }
-
- /** 涓や釜鏃跺埢鐨勫垎閽熷樊锛屾寜涓�澶� 24 灏忔椂鍙栨渶杩戠殑鐜洖璺濈锛�23:50 涓� 00:10 鍙樊 20 鍒嗛挓锛� */
- private static long minutesBetween(LocalTime one, LocalTime other) {
- long minutes = Math.abs(Duration.between(one, other).toMinutes());
- return Math.min(minutes, 24 * 60 - minutes);
- }
-
-}
\ No newline at end of file
+}
--
Gitblit v1.9.3