From a063b6faf44f5810b325ccffbdc503188d721ca5 Mon Sep 17 00:00:00 2001
From: tuqin <tuqin@tuqin.cn>
Date: 星期五, 23 十月 2026 10:18:22 +0800
Subject: [PATCH] feat(hrm): 考勤规则支持同一部门配置多条（按生效日期区间生效）
---
yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/attendance/vo/HrmAttendanceRuleRespVO.java | 9 +++
sql/mysql/hrm_attendance_rule_add_effective_date.sql | 41 +++++++++++++
yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/attendance/vo/HrmAttendanceRuleSaveReqVO.java | 7 ++
yudao-module-hrm-api/src/main/java/cn/iocoder/yudao/module/hrm/enums/ErrorCodeConstants.java | 1
yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/dal/dataobject/attendance/HrmAttendanceRuleDO.java | 10 +++
yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/attendance/HrmAttendanceRecordServiceImpl.java | 8 +-
yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/attendance/HrmAttendanceRuleService.java | 8 +-
yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/attendance/HrmAttendanceRuleServiceImpl.java | 79 ++++++++++++++++---------
8 files changed, 127 insertions(+), 36 deletions(-)
diff --git a/sql/mysql/hrm_attendance_rule_add_effective_date.sql b/sql/mysql/hrm_attendance_rule_add_effective_date.sql
new file mode 100644
index 0000000..f58d44b
--- /dev/null
+++ b/sql/mysql/hrm_attendance_rule_add_effective_date.sql
@@ -0,0 +1,41 @@
+-- =============================================
+-- 鑰冨嫟瑙勫垯锛氭敮鎸佸悓涓�閮ㄩ棬閰嶇疆澶氭潯瑙勫垯锛堟寜鐢熸晥鏃ユ湡鍖洪棿鍖哄垎锛�
+--
+-- 鍙樻洿锛歨rm_attendance_rule 澧炲姞 2 鍒�
+-- effective_start_date 鐢熸晥寮�濮嬫棩鏈燂紙NULL = 涓嶉檺锛�
+-- effective_end_date 鐢熸晥缁撴潫鏃ユ湡锛圢ULL = 涓嶉檺锛�
+--
+-- 鍖归厤瑙勫垯锛堝悗绔� HrmAttendanceRuleServiceImpl.getAttendanceRuleByDeptId锛夛細
+-- 1) 浼樺厛鍙栭儴闂ㄤ笓灞炶鍒欙紝娌℃湁鍒欏彇鍏ㄥ眬瑙勫垯锛坉ept_id IS NULL锛�
+-- 2) 鍙彇 status=0 涓� 鐢熸晥鍖洪棿瑕嗙洊鑰冨嫟鏃ユ湡 鐨勮鍒�
+-- 3) 澶氭潯鍛戒腑鏃讹紝鍙� effective_start_date 鏈�鏅氱殑閭ｆ潯锛圢ULL 瑙嗕负闀挎湡鏈夋晥銆佷紭鍏堢骇鏈�浣庯級
+--
+-- 鑴氭湰鍙噸澶嶆墽琛岋紙骞傜瓑锛�
+-- =============================================
+SET NAMES utf8mb4;
+
+SET @sch := DATABASE();
+
+-- 1. 澧炲姞 effective_start_date
+SET @exists := (SELECT COUNT(*) FROM information_schema.COLUMNS
+ WHERE TABLE_SCHEMA = @sch AND TABLE_NAME = 'hrm_attendance_rule' AND COLUMN_NAME = 'effective_start_date');
+SET @sql := IF(@exists = 0,
+ 'ALTER TABLE `hrm_attendance_rule` ADD COLUMN `effective_start_date` date DEFAULT NULL COMMENT ''鐢熸晥寮�濮嬫棩鏈燂紙绌鸿〃绀轰笉闄愶級'' AFTER `overtime_threshold`',
+ 'SELECT ''effective_start_date 宸插瓨鍦紝璺宠繃'' AS msg');
+PREPARE stmt FROM @sql; EXECUTE stmt; DEALLOCATE PREPARE stmt;
+
+-- 2. 澧炲姞 effective_end_date
+SET @exists := (SELECT COUNT(*) FROM information_schema.COLUMNS
+ WHERE TABLE_SCHEMA = @sch AND TABLE_NAME = 'hrm_attendance_rule' AND COLUMN_NAME = 'effective_end_date');
+SET @sql := IF(@exists = 0,
+ 'ALTER TABLE `hrm_attendance_rule` ADD COLUMN `effective_end_date` date DEFAULT NULL COMMENT ''鐢熸晥缁撴潫鏃ユ湡锛堢┖琛ㄧず涓嶉檺锛�'' AFTER `effective_start_date`',
+ 'SELECT ''effective_end_date 宸插瓨鍦紝璺宠繃'' AS msg');
+PREPARE stmt FROM @sql; EXECUTE stmt; DEALLOCATE PREPARE stmt;
+
+-- 3. 鏍稿
+SELECT COLUMN_NAME, COLUMN_TYPE, IS_NULLABLE, COLUMN_COMMENT
+FROM information_schema.COLUMNS
+WHERE TABLE_SCHEMA = @sch AND TABLE_NAME = 'hrm_attendance_rule'
+ AND COLUMN_NAME IN ('effective_start_date', 'effective_end_date');
+
+SELECT '鑰冨嫟瑙勫垯鐢熸晥鏃ユ湡瀛楁鍒濆鍖栧畬鎴�' AS result;
diff --git a/yudao-module-hrm-api/src/main/java/cn/iocoder/yudao/module/hrm/enums/ErrorCodeConstants.java b/yudao-module-hrm-api/src/main/java/cn/iocoder/yudao/module/hrm/enums/ErrorCodeConstants.java
index f72d998..3af9511 100644
--- a/yudao-module-hrm-api/src/main/java/cn/iocoder/yudao/module/hrm/enums/ErrorCodeConstants.java
+++ b/yudao-module-hrm-api/src/main/java/cn/iocoder/yudao/module/hrm/enums/ErrorCodeConstants.java
@@ -93,6 +93,7 @@
ErrorCode ATTENDANCE_EXCEPTION_UPDATE_AUDIT_STATUS_FAIL = new ErrorCode(1_030_004_014, "鏇存柊鑰冨嫟寮傚父瀹℃壒鐘舵�佸け璐ワ紝鍘熷洜锛氫笉鏄鎵逛腑鐘舵��");
ErrorCode ATTENDANCE_EXCEPTION_BPM_PROCESS_DEFINITION_NOT_EXISTS = new ErrorCode(1_030_004_015, "鑰冨嫟寮傚父瀹℃壒娴佺▼涓嶅瓨鍦�");
ErrorCode ATTENDANCE_CLOCK_ALREADY_CLOCKED = new ErrorCode(1_030_004_016, "宸叉墦杩囧崱锛岃鍕块噸澶嶆墦鍗�");
+ ErrorCode ATTENDANCE_RULE_EFFECTIVE_DATE_INVALID = new ErrorCode(1_030_004_017, "鐢熸晥寮�濮嬫棩鏈熶笉鑳芥櫄浜庣敓鏁堢粨鏉熸棩鏈�");
// ========== 钖叕绠＄悊 1-030-005-000 ==========
ErrorCode SALARY_STRUCTURE_NOT_EXISTS = new ErrorCode(1_030_005_000, "钖叕缁撴瀯涓嶅瓨鍦�");
diff --git a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/attendance/vo/HrmAttendanceRuleRespVO.java b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/attendance/vo/HrmAttendanceRuleRespVO.java
index 360c315..f28e95d 100644
--- a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/attendance/vo/HrmAttendanceRuleRespVO.java
+++ b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/attendance/vo/HrmAttendanceRuleRespVO.java
@@ -8,6 +8,7 @@
import lombok.Data;
import java.math.BigDecimal;
+import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.LocalTime;
@@ -51,6 +52,14 @@
@ExcelProperty("鍔犵彮璧风畻鏃堕暱")
private BigDecimal overtimeThreshold;
+ @Schema(description = "鐢熸晥寮�濮嬫棩鏈燂紙绌鸿〃绀轰笉闄愶級")
+ @ExcelProperty("鐢熸晥寮�濮嬫棩鏈�")
+ private LocalDate effectiveStartDate;
+
+ @Schema(description = "鐢熸晥缁撴潫鏃ユ湡锛堢┖琛ㄧず涓嶉檺锛�")
+ @ExcelProperty("鐢熸晥缁撴潫鏃ユ湡")
+ private LocalDate effectiveEndDate;
+
@Schema(description = "鐘舵�侊細0-鍚敤锛�1-绂佺敤")
@ExcelProperty(value = "鐘舵��", converter = DictConvert.class)
@DictFormat("hrm_rule_status")
diff --git a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/attendance/vo/HrmAttendanceRuleSaveReqVO.java b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/attendance/vo/HrmAttendanceRuleSaveReqVO.java
index 8c244a8..ba2737e 100644
--- a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/attendance/vo/HrmAttendanceRuleSaveReqVO.java
+++ b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/attendance/vo/HrmAttendanceRuleSaveReqVO.java
@@ -6,6 +6,7 @@
import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.NotNull;
import java.math.BigDecimal;
+import java.time.LocalDate;
import java.time.LocalTime;
@Schema(description = "绠＄悊鍚庡彴 - 鑰冨嫟瑙勫垯鏂板/淇敼 Request VO")
@@ -39,6 +40,12 @@
@Schema(description = "鍔犵彮璧风畻鏃堕暱锛堝皬鏃讹級", example = "1")
private BigDecimal overtimeThreshold;
+ @Schema(description = "鐢熸晥寮�濮嬫棩鏈燂紙绌鸿〃绀轰笉闄愶級", example = "2026-01-01")
+ private LocalDate effectiveStartDate;
+
+ @Schema(description = "鐢熸晥缁撴潫鏃ユ湡锛堢┖琛ㄧず涓嶉檺锛�", example = "2026-12-31")
+ private LocalDate effectiveEndDate;
+
@Schema(description = "鐘舵�侊細0-鍚敤锛�1-绂佺敤", example = "0")
private Integer status;
diff --git a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/dal/dataobject/attendance/HrmAttendanceRuleDO.java b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/dal/dataobject/attendance/HrmAttendanceRuleDO.java
index 71bdfdc..d49ce30 100644
--- a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/dal/dataobject/attendance/HrmAttendanceRuleDO.java
+++ b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/dal/dataobject/attendance/HrmAttendanceRuleDO.java
@@ -68,6 +68,16 @@
private BigDecimal overtimeThreshold;
/**
+ * 鐢熸晥寮�濮嬫棩鏈燂紙绌鸿〃绀轰笉闄愶級
+ */
+ private LocalDate effectiveStartDate;
+
+ /**
+ * 鐢熸晥缁撴潫鏃ユ湡锛堢┖琛ㄧず涓嶉檺锛�
+ */
+ private LocalDate effectiveEndDate;
+
+ /**
* 鐘舵�侊細0-鍚敤锛�1-绂佺敤
*/
private Integer status;
diff --git a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/attendance/HrmAttendanceRecordServiceImpl.java b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/attendance/HrmAttendanceRecordServiceImpl.java
index 60ba60d..06ef7f4 100644
--- a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/attendance/HrmAttendanceRecordServiceImpl.java
+++ b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/attendance/HrmAttendanceRecordServiceImpl.java
@@ -88,7 +88,7 @@
if (record.getDeptId() == null) {
return;
}
- HrmAttendanceRuleDO rule = attendanceRuleService.getAttendanceRuleByDeptId(record.getDeptId());
+ HrmAttendanceRuleDO rule = attendanceRuleService.getAttendanceRuleByDeptId(record.getDeptId(), record.getDate());
if (rule == null) {
return;
}
@@ -125,7 +125,7 @@
}
// 鍔犵彮鏃堕暱锛氭寜鑰冨嫟瑙勫垯鐨勬爣鍑嗕笅鐝椂闂磋绠楄秴棰濋儴鍒�
if (record.getClockOutTime() != null && record.getDeptId() != null) {
- HrmAttendanceRuleDO rule = attendanceRuleService.getAttendanceRuleByDeptId(record.getDeptId());
+ HrmAttendanceRuleDO rule = attendanceRuleService.getAttendanceRuleByDeptId(record.getDeptId(), record.getDate());
if (rule != null && rule.getWorkEndTime() != null) {
LocalTime workEnd = rule.getWorkEndTime();
LocalDate outDate = record.getClockOutTime().toLocalDate();
@@ -159,7 +159,7 @@
if (employee == null) {
throw exception(EMPLOYEE_NOT_EXISTS);
}
- HrmAttendanceRuleDO rule = attendanceRuleService.getAttendanceRuleByDeptId(employee.getDeptId());
+ HrmAttendanceRuleDO rule = attendanceRuleService.getAttendanceRuleByDeptId(employee.getDeptId(), clockDate);
if (rule == null) {
throw exception(ATTENDANCE_CLOCK_FAIL_NO_RULE);
}
@@ -212,7 +212,7 @@
if (employee == null) {
throw exception(EMPLOYEE_NOT_EXISTS);
}
- HrmAttendanceRuleDO rule = attendanceRuleService.getAttendanceRuleByDeptId(employee.getDeptId());
+ HrmAttendanceRuleDO rule = attendanceRuleService.getAttendanceRuleByDeptId(employee.getDeptId(), clockDate);
if (rule == null) {
throw exception(ATTENDANCE_CLOCK_FAIL_NO_RULE);
}
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..96eaf1b 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,14 @@
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);
}
\ No newline at end of file
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 ecc82a7..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
@@ -2,6 +2,7 @@
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 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;
@@ -11,6 +12,7 @@
import org.springframework.validation.annotation.Validated;
import java.math.BigDecimal;
+import java.time.LocalDate;
import java.util.List;
import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
@@ -18,6 +20,9 @@
/**
* 鑰冨嫟瑙勫垯閰嶇疆 Service 瀹炵幇绫�
+ *
+ * 璇存槑锛氬悓涓�閮ㄩ棬鍏佽閰嶇疆澶氭潯瑙勫垯锛屾寜銆岀敓鏁堝紑濮嬫棩鏈� / 鐢熸晥缁撴潫鏃ユ湡銆嶅尯闂村尯鍒嗭紱
+ * 鍖归厤鏃跺彇瑕嗙洊鐩爣鏃ユ湡銆佷笖鐢熸晥寮�濮嬫棩鏈熸渶鏅氱殑閭ｆ潯锛堟棤鏃ユ湡鐨勮涓洪暱鏈熸湁鏁堬紝浼樺厛绾ф渶浣庯級銆�
*
* @author 瓒呯骇绠＄悊鍛�
*/
@@ -30,12 +35,9 @@
@Override
public Long createAttendanceRule(HrmAttendanceRuleSaveReqVO createReqVO) {
- // 鏍￠獙瑙勫垯鍚嶇О鏄惁閲嶅
+ // 鏍￠獙瑙勫垯鍚嶇О鏄惁閲嶅锛堝悓涓�閮ㄩ棬鍏佽澶氭潯瑙勫垯锛屼笉鍐嶉檺鍒堕儴闂ㄥ敮涓�锛�
validateAttendanceRuleNameUnique(null, createReqVO.getName());
- // 鏍￠獙閮ㄩ棬鏄惁宸查厤缃鍒欙紙濡傛灉鎸囧畾浜嗛儴闂級
- if (createReqVO.getDeptId() != null) {
- validateAttendanceRuleDeptUnique(null, createReqVO.getDeptId());
- }
+ validateEffectiveDateRange(createReqVO.getEffectiveStartDate(), createReqVO.getEffectiveEndDate());
HrmAttendanceRuleDO attendanceRule = BeanUtils.toBean(createReqVO, HrmAttendanceRuleDO.class);
// 璁剧疆榛樿鍊�
if (attendanceRule.getLateAllowMinutes() == null) {
@@ -59,10 +61,7 @@
validateAttendanceRuleExists(updateReqVO.getId());
// 鏍￠獙瑙勫垯鍚嶇О鏄惁閲嶅
validateAttendanceRuleNameUnique(updateReqVO.getId(), updateReqVO.getName());
- // 鏍￠獙閮ㄩ棬鏄惁宸查厤缃鍒欙紙濡傛灉鎸囧畾浜嗛儴闂級
- if (updateReqVO.getDeptId() != null) {
- validateAttendanceRuleDeptUnique(updateReqVO.getId(), updateReqVO.getDeptId());
- }
+ validateEffectiveDateRange(updateReqVO.getEffectiveStartDate(), updateReqVO.getEffectiveEndDate());
HrmAttendanceRuleDO updateObj = BeanUtils.toBean(updateReqVO, HrmAttendanceRuleDO.class);
attendanceRuleMapper.updateById(updateObj);
}
@@ -92,15 +91,12 @@
}
}
- private void validateAttendanceRuleDeptUnique(Long id, Long deptId) {
- List<HrmAttendanceRuleDO> rules = attendanceRuleMapper.selectListByDeptId(deptId);
- if (rules.isEmpty()) {
- return;
- }
- for (HrmAttendanceRuleDO rule : rules) {
- if (id == null || !rule.getId().equals(id)) {
- throw exception(ATTENDANCE_RULE_DEPT_EXISTS);
- }
+ /**
+ * 鏍￠獙鐢熸晥鏃ユ湡鍖洪棿锛氬紑濮嬫棩鏈熶笉鑳芥櫄浜庣粨鏉熸棩鏈�
+ */
+ private void validateEffectiveDateRange(LocalDate startDate, LocalDate endDate) {
+ if (startDate != null && endDate != null && startDate.isAfter(endDate)) {
+ throw exception(ATTENDANCE_RULE_EFFECTIVE_DATE_INVALID);
}
}
@@ -120,22 +116,47 @@
}
@Override
- public HrmAttendanceRuleDO getAttendanceRuleByDeptId(Long deptId) {
- // 1. 鍏堟煡鎵鹃儴闂ㄤ笓灞炶鍒�
- List<HrmAttendanceRuleDO> deptRules = attendanceRuleMapper.selectList(new cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX<HrmAttendanceRuleDO>()
- .eq(HrmAttendanceRuleDO::getDeptId, deptId)
- .eq(HrmAttendanceRuleDO::getStatus, 0));
- if (!deptRules.isEmpty()) {
- return deptRules.get(0);
+ 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 cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX<HrmAttendanceRuleDO>()
- .isNull(HrmAttendanceRuleDO::getDeptId)
- .eq(HrmAttendanceRuleDO::getStatus, 0));
+ List<HrmAttendanceRuleDO> globalRules = selectEffectiveRules(null, targetDate);
if (!globalRules.isEmpty()) {
return globalRules.get(0);
}
return null;
}
-}
\ No newline at end of file
+ /**
+ * 鏌ヨ鍦ㄦ寚瀹氭棩鏈熺敓鏁堢殑瑙勫垯
+ *
+ * @param deptId 閮ㄩ棬ID锛宯ull 琛ㄧず鍏ㄥ眬瑙勫垯
+ * @param date 鐩爣鏃ユ湡
+ */
+ 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);
+ }
+ 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);
+ }
+
+}
--
Gitblit v1.9.3