From 25a40b9c4e6a1b650610b8b13088d486699532ce Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期四, 05 十一月 2026 20:23:21 +0800
Subject: [PATCH] 采购申请批量提交、订单导入重复校验；修复考勤异常申请字段不匹配
---
yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/dal/mysql/attendance/HrmAttendanceExceptionMapper.java | 13 ++++++++++---
1 files changed, 10 insertions(+), 3 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 7cc071c..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,6 +7,8 @@
import cn.iocoder.yudao.module.hrm.dal.dataobject.attendance.HrmAttendanceExceptionDO;
import org.apache.ibatis.annotations.Mapper;
+import java.time.LocalDate;
+
/**
* 鑰冨嫟寮傚父鐢宠 Mapper
*
@@ -16,13 +18,18 @@
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