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/dal/mysql/attendance/HrmAttendanceHolidayMapper.java | 30 +++++++++++-------------------
1 files changed, 11 insertions(+), 19 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 2ebdc80..d38a149 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
@@ -19,30 +19,22 @@
public interface HrmAttendanceHolidayMapper extends BaseMapperX<HrmAttendanceHolidayDO> {
default PageResult<HrmAttendanceHolidayDO> selectPage(HrmAttendanceHolidayPageReqVO reqVO) {
- LambdaQueryWrapperX<HrmAttendanceHolidayDO> query = new LambdaQueryWrapperX<HrmAttendanceHolidayDO>()
+ return selectPage(reqVO, new LambdaQueryWrapperX<HrmAttendanceHolidayDO>()
.likeIfPresent(HrmAttendanceHolidayDO::getName, reqVO.getName())
.eqIfPresent(HrmAttendanceHolidayDO::getType, reqVO.getType())
- .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));
+ .betweenIfPresent(HrmAttendanceHolidayDO::getDate, reqVO.getStartDate(), reqVO.getEndDate())
+ .orderByDesc(HrmAttendanceHolidayDO::getDate));
}
- /**
- * 鏌ヨ鏃堕棿娈典笌 [startDate, endDate] 鏈変氦闆嗙殑閰嶇疆
- * 浼犲叆鍚屼竴澶╋紙date, date锛夋椂锛屽嵆鏌ヨ瑕嗙洊璇ユ棩鐨勯厤缃�
- */
- default List<HrmAttendanceHolidayDO> selectListByDateRange(LocalDate startDate, LocalDate endDate) {
+ default HrmAttendanceHolidayDO selectByDate(LocalDate date) {
+ return selectOne(HrmAttendanceHolidayDO::getDate, date);
+ }
+
+ default List<HrmAttendanceHolidayDO> selectListByDateBetween(LocalDate startDate, LocalDate endDate) {
return selectList(new LambdaQueryWrapperX<HrmAttendanceHolidayDO>()
- .le(HrmAttendanceHolidayDO::getStartDate, endDate)
- .ge(HrmAttendanceHolidayDO::getEndDate, startDate)
- .orderByAsc(HrmAttendanceHolidayDO::getStartDate)
- .orderByAsc(HrmAttendanceHolidayDO::getId));
+ .ge(HrmAttendanceHolidayDO::getDate, startDate)
+ .le(HrmAttendanceHolidayDO::getDate, endDate)
+ .orderByAsc(HrmAttendanceHolidayDO::getDate));
}
}
\ No newline at end of file
--
Gitblit v1.9.3