From d54fbc9d4f8981fa0f7f613b33a28a8cd4f764ea Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期日, 25 十月 2026 16:29:53 +0800
Subject: [PATCH] feat(system): 优化用户搜索功能并完善ERP和MES模块验证逻辑
---
yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/dal/mysql/attendance/HrmAttendanceExceptionMapper.java | 25 ++++++++++++++++++++++++-
1 files changed, 24 insertions(+), 1 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 fc1afba..727fc2d 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
@@ -5,6 +5,7 @@
import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
import cn.iocoder.yudao.module.hrm.controller.admin.attendance.vo.HrmAttendanceExceptionPageReqVO;
import cn.iocoder.yudao.module.hrm.dal.dataobject.attendance.HrmAttendanceExceptionDO;
+import cn.iocoder.yudao.module.hrm.enums.HrmAuditStatusEnum;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import org.apache.ibatis.annotations.Mapper;
@@ -45,6 +46,8 @@
default int submitAndResetAuditInfo(Long id, Integer status) {
return update(null, new LambdaUpdateWrapper<HrmAttendanceExceptionDO>()
.eq(HrmAttendanceExceptionDO::getId, id)
+ .in(HrmAttendanceExceptionDO::getStatus,
+ HrmAuditStatusEnum.DRAFT.getStatus(), HrmAuditStatusEnum.REJECT.getStatus())
.set(HrmAttendanceExceptionDO::getStatus, status)
.set(HrmAttendanceExceptionDO::getReviewerId, null)
.set(HrmAttendanceExceptionDO::getReviewerName, null)
@@ -68,12 +71,32 @@
String reviewerName, String reviewRemark) {
return update(null, new LambdaUpdateWrapper<HrmAttendanceExceptionDO>()
.eq(HrmAttendanceExceptionDO::getId, id)
+ .eq(HrmAttendanceExceptionDO::getStatus, HrmAuditStatusEnum.PROCESS.getStatus())
.set(HrmAttendanceExceptionDO::getStatus, status)
.set(HrmAttendanceExceptionDO::getReviewerId, reviewerId)
.set(HrmAttendanceExceptionDO::getReviewerName, reviewerName)
.set(HrmAttendanceExceptionDO::getReviewTime, LocalDateTime.now())
.set(HrmAttendanceExceptionDO::getReviewRemark, reviewRemark)
- .set(HrmAttendanceExceptionDO::getApproveTime, LocalDateTime.now()));
+ // 浠呭鏍搁�氳繃鏃跺啓鍏ラ�氳繃鏃堕棿锛岄┏鍥炰笉鍐�
+ .set(HrmAuditStatusEnum.APPROVE.getStatus().equals(status),
+ HrmAttendanceExceptionDO::getApproveTime, LocalDateTime.now()));
+ }
+
+ /**
+ * BPM 瀹℃壒缁撴潫鍚庡洖鍐欒�冨嫟寮傚父鐢宠鐘舵��
+ *
+ * 浠呭綋鐢宠浠嶅浜庛�屽鎵逛腑銆嶆椂鏇存柊锛岄伩鍏嶄笌鏃у鎵硅矾寰勯噸澶嶈鐩栥��
+ */
+ default int updateAuditStatusByBpm(Long id, Integer status, String reviewRemark) {
+ return update(null, new LambdaUpdateWrapper<HrmAttendanceExceptionDO>()
+ .eq(HrmAttendanceExceptionDO::getId, id)
+ .eq(HrmAttendanceExceptionDO::getStatus, HrmAuditStatusEnum.PROCESS.getStatus())
+ .set(HrmAttendanceExceptionDO::getStatus, status)
+ .set(HrmAttendanceExceptionDO::getReviewTime, LocalDateTime.now())
+ .set(HrmAttendanceExceptionDO::getReviewRemark, reviewRemark)
+ // 浠呭鎵归�氳繃鏃跺啓鍏ラ�氳繃鏃堕棿锛岄┏鍥�/鍙栨秷涓嶅啓
+ .set(HrmAuditStatusEnum.APPROVE.getStatus().equals(status),
+ HrmAttendanceExceptionDO::getApproveTime, LocalDateTime.now()));
}
}
\ No newline at end of file
--
Gitblit v1.9.3