From a797b5801af481990e40c029221c55229291eae8 Mon Sep 17 00:00:00 2001
From: 吴羡 <16976746+Xian-TT3@user.noreply.gitee.com>
Date: 星期三, 30 九月 2026 19:31:06 +0800
Subject: [PATCH] feat: 考勤节假日配置改为时间段、物料列表排序优化
---
yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/dal/mysql/attendance/HrmAttendanceHolidayMapper.java | 32 ++++++++++++++++++++------------
1 files changed, 20 insertions(+), 12 deletions(-)
diff --git a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/dal/mysql/attendance/HrmAttendanceHolidayMapper.java b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/dal/mysql/attendance/HrmAttendanceHolidayMapper.java
index 44c03af..2ebdc80 100644
--- a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/dal/mysql/attendance/HrmAttendanceHolidayMapper.java
+++ b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/dal/mysql/attendance/HrmAttendanceHolidayMapper.java
@@ -13,28 +13,36 @@
/**
* 鑰冨嫟鑺傚亣鏃ラ厤缃� Mapper
*
- * @author 鑺嬮亾婧愮爜
+ * @author 瓒呯骇绠＄悊鍛�
*/
@Mapper
public interface HrmAttendanceHolidayMapper extends BaseMapperX<HrmAttendanceHolidayDO> {
default PageResult<HrmAttendanceHolidayDO> selectPage(HrmAttendanceHolidayPageReqVO reqVO) {
- return selectPage(reqVO, new LambdaQueryWrapperX<HrmAttendanceHolidayDO>()
+ LambdaQueryWrapperX<HrmAttendanceHolidayDO> query = new LambdaQueryWrapperX<HrmAttendanceHolidayDO>()
.likeIfPresent(HrmAttendanceHolidayDO::getName, reqVO.getName())
.eqIfPresent(HrmAttendanceHolidayDO::getType, reqVO.getType())
- .betweenIfPresent(HrmAttendanceHolidayDO::getDate, reqVO.getStartDate(), reqVO.getEndDate())
- .orderByDesc(HrmAttendanceHolidayDO::getDate));
+ .eqIfPresent(HrmAttendanceHolidayDO::getIsLegal, reqVO.getIsLegal());
+ // 鏃ユ湡绛涢�夛細閰嶇疆鏃堕棿娈典笌鏌ヨ鍖洪棿鏈変氦闆嗗嵆鍛戒腑
+ LocalDate[] dateRange = reqVO.getDate();
+ if (dateRange != null && dateRange.length >= 2 && dateRange[0] != null && dateRange[1] != null) {
+ query.le(HrmAttendanceHolidayDO::getStartDate, dateRange[1])
+ .ge(HrmAttendanceHolidayDO::getEndDate, dateRange[0]);
+ }
+ return selectPage(reqVO, query.orderByDesc(HrmAttendanceHolidayDO::getStartDate)
+ .orderByDesc(HrmAttendanceHolidayDO::getId));
}
- default HrmAttendanceHolidayDO selectByDate(LocalDate date) {
- return selectOne(HrmAttendanceHolidayDO::getDate, date);
- }
-
- default List<HrmAttendanceHolidayDO> selectListByDateBetween(LocalDate startDate, LocalDate endDate) {
+ /**
+ * 鏌ヨ鏃堕棿娈典笌 [startDate, endDate] 鏈変氦闆嗙殑閰嶇疆
+ * 浼犲叆鍚屼竴澶╋紙date, date锛夋椂锛屽嵆鏌ヨ瑕嗙洊璇ユ棩鐨勯厤缃�
+ */
+ default List<HrmAttendanceHolidayDO> selectListByDateRange(LocalDate startDate, LocalDate endDate) {
return selectList(new LambdaQueryWrapperX<HrmAttendanceHolidayDO>()
- .ge(HrmAttendanceHolidayDO::getDate, startDate)
- .le(HrmAttendanceHolidayDO::getDate, endDate)
- .orderByAsc(HrmAttendanceHolidayDO::getDate));
+ .le(HrmAttendanceHolidayDO::getStartDate, endDate)
+ .ge(HrmAttendanceHolidayDO::getEndDate, startDate)
+ .orderByAsc(HrmAttendanceHolidayDO::getStartDate)
+ .orderByAsc(HrmAttendanceHolidayDO::getId));
}
}
\ No newline at end of file
--
Gitblit v1.9.3