From ef3cbc1c6882786e8218b08be3e52ea44587f03b Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期日, 08 十一月 2026 09:45:42 +0800
Subject: [PATCH] feat(hrm): 请假批量导入、加班代申请人、批量排班与节假日区间联动
---
yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/dal/mysql/attendance/HrmAttendanceExceptionMapper.java | 15 +++++++++++----
1 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/dal/mysql/attendance/HrmAttendanceExceptionMapper.java b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/dal/mysql/attendance/HrmAttendanceExceptionMapper.java
index e629afc..6441617 100644
--- a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/dal/mysql/attendance/HrmAttendanceExceptionMapper.java
+++ b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/dal/mysql/attendance/HrmAttendanceExceptionMapper.java
@@ -7,22 +7,29 @@
import cn.iocoder.yudao.module.hrm.dal.dataobject.attendance.HrmAttendanceExceptionDO;
import org.apache.ibatis.annotations.Mapper;
+import java.time.LocalDate;
+
/**
* 鑰冨嫟寮傚父鐢宠 Mapper
*
- * @author 鑺嬮亾婧愮爜
+ * @author 瓒呯骇绠＄悊鍛�
*/
@Mapper
public interface HrmAttendanceExceptionMapper extends BaseMapperX<HrmAttendanceExceptionDO> {
default PageResult<HrmAttendanceExceptionDO> selectPage(HrmAttendanceExceptionPageReqVO reqVO) {
- return selectPage(reqVO, new LambdaQueryWrapperX<HrmAttendanceExceptionDO>()
+ LambdaQueryWrapperX<HrmAttendanceExceptionDO> query = new LambdaQueryWrapperX<HrmAttendanceExceptionDO>()
.likeIfPresent(HrmAttendanceExceptionDO::getNo, reqVO.getNo())
.eqIfPresent(HrmAttendanceExceptionDO::getUserId, reqVO.getUserId())
.eqIfPresent(HrmAttendanceExceptionDO::getDeptId, reqVO.getDeptId())
.eqIfPresent(HrmAttendanceExceptionDO::getType, reqVO.getType())
- .eqIfPresent(HrmAttendanceExceptionDO::getStatus, reqVO.getStatus())
- .orderByDesc(HrmAttendanceExceptionDO::getId));
+ .eqIfPresent(HrmAttendanceExceptionDO::getStatus, reqVO.getStatus());
+ // 寮傚父鏃ユ湡鍖洪棿绛涢��
+ LocalDate[] dateRange = reqVO.getDate();
+ if (dateRange != null && dateRange.length >= 2 && dateRange[0] != null && dateRange[1] != null) {
+ query.between(HrmAttendanceExceptionDO::getExceptionDate, dateRange[0], dateRange[1]);
+ }
+ return selectPage(reqVO, query.orderByDesc(HrmAttendanceExceptionDO::getId));
}
default HrmAttendanceExceptionDO selectByNo(String no) {
--
Gitblit v1.9.3