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/approval/HrmLeaveApplicationMapper.java | 17 +++++++++++++++++
1 files changed, 17 insertions(+), 0 deletions(-)
diff --git a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/dal/mysql/approval/HrmLeaveApplicationMapper.java b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/dal/mysql/approval/HrmLeaveApplicationMapper.java
index 63520f4..77ffff5 100644
--- a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/dal/mysql/approval/HrmLeaveApplicationMapper.java
+++ b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/dal/mysql/approval/HrmLeaveApplicationMapper.java
@@ -48,6 +48,8 @@
default int submitAndResetAuditInfo(Long id, Integer status) {
return update(null, new LambdaUpdateWrapper<HrmLeaveApplicationDO>()
.eq(HrmLeaveApplicationDO::getId, id)
+ .in(HrmLeaveApplicationDO::getStatus,
+ HrmAuditStatusEnum.DRAFT.getStatus(), HrmAuditStatusEnum.REJECT.getStatus())
.set(HrmLeaveApplicationDO::getStatus, status)
.set(HrmLeaveApplicationDO::getReviewerId, null)
.set(HrmLeaveApplicationDO::getReviewerName, null)
@@ -71,6 +73,7 @@
String reviewerName, String reviewRemark) {
return update(null, new LambdaUpdateWrapper<HrmLeaveApplicationDO>()
.eq(HrmLeaveApplicationDO::getId, id)
+ .eq(HrmLeaveApplicationDO::getStatus, HrmAuditStatusEnum.PROCESS.getStatus())
.set(HrmLeaveApplicationDO::getStatus, status)
.set(HrmLeaveApplicationDO::getReviewerId, reviewerId)
.set(HrmLeaveApplicationDO::getReviewerName, reviewerName)
@@ -79,6 +82,20 @@
}
/**
+ * BPM 瀹℃壒缁撴潫鍚庡洖鍐欒鍋囩敵璇风姸鎬�
+ *
+ * 浠呭綋鐢宠浠嶅浜庛�屽鎵逛腑銆嶆椂鏇存柊锛岄伩鍏嶄笌鏃у鎵硅矾寰勯噸澶嶈鐩栥��
+ */
+ default int updateAuditStatusByBpm(Long id, Integer status, String reviewRemark) {
+ return update(null, new LambdaUpdateWrapper<HrmLeaveApplicationDO>()
+ .eq(HrmLeaveApplicationDO::getId, id)
+ .eq(HrmLeaveApplicationDO::getStatus, HrmAuditStatusEnum.PROCESS.getStatus())
+ .set(HrmLeaveApplicationDO::getStatus, status)
+ .set(HrmLeaveApplicationDO::getReviewTime, LocalDateTime.now())
+ .set(HrmLeaveApplicationDO::getReviewRemark, reviewRemark));
+ }
+
+ /**
* 鏌ヨ鍛樺伐鍦ㄦ寚瀹氭椂闂磋寖鍥村唴宸插鎵归�氳繃鐨勮鍋囪褰�
*
* @param userId 鍛樺伐ID锛堢郴缁熺敤鎴稩D锛�
--
Gitblit v1.9.3