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/HrmRegularizeApplicationMapper.java | 18 ++++++++++++++++++
1 files changed, 18 insertions(+), 0 deletions(-)
diff --git a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/dal/mysql/approval/HrmRegularizeApplicationMapper.java b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/dal/mysql/approval/HrmRegularizeApplicationMapper.java
index 08f6f4c..d7b49a7 100644
--- a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/dal/mysql/approval/HrmRegularizeApplicationMapper.java
+++ b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/dal/mysql/approval/HrmRegularizeApplicationMapper.java
@@ -5,6 +5,7 @@
import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
import cn.iocoder.yudao.module.hrm.controller.admin.approval.vo.HrmRegularizeApplicationPageReqVO;
import cn.iocoder.yudao.module.hrm.dal.dataobject.approval.HrmRegularizeApplicationDO;
+import cn.iocoder.yudao.module.hrm.enums.HrmAuditStatusEnum;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import org.apache.ibatis.annotations.Mapper;
@@ -46,6 +47,8 @@
default int submitAndResetAuditInfo(Long id, Integer status) {
return update(null, new LambdaUpdateWrapper<HrmRegularizeApplicationDO>()
.eq(HrmRegularizeApplicationDO::getId, id)
+ .in(HrmRegularizeApplicationDO::getStatus,
+ HrmAuditStatusEnum.DRAFT.getStatus(), HrmAuditStatusEnum.REJECT.getStatus())
.set(HrmRegularizeApplicationDO::getStatus, status)
.set(HrmRegularizeApplicationDO::getReviewerId, null)
.set(HrmRegularizeApplicationDO::getReviewerName, null)
@@ -69,6 +72,7 @@
String reviewerName, String reviewRemark) {
return update(null, new LambdaUpdateWrapper<HrmRegularizeApplicationDO>()
.eq(HrmRegularizeApplicationDO::getId, id)
+ .eq(HrmRegularizeApplicationDO::getStatus, HrmAuditStatusEnum.PROCESS.getStatus())
.set(HrmRegularizeApplicationDO::getStatus, status)
.set(HrmRegularizeApplicationDO::getReviewerId, reviewerId)
.set(HrmRegularizeApplicationDO::getReviewerName, reviewerName)
@@ -76,6 +80,20 @@
.set(HrmRegularizeApplicationDO::getReviewRemark, reviewRemark));
}
+ /**
+ * BPM 瀹℃壒缁撴潫鍚庡洖鍐欒浆姝ｇ敵璇风姸鎬�
+ *
+ * 浠呭綋鐢宠浠嶅浜庛�屽鎵逛腑銆嶆椂鏇存柊锛岄伩鍏嶄笌鏃у鎵硅矾寰勯噸澶嶈鐩栥��
+ */
+ default int updateAuditStatusByBpm(Long id, Integer status, String reviewRemark) {
+ return update(null, new LambdaUpdateWrapper<HrmRegularizeApplicationDO>()
+ .eq(HrmRegularizeApplicationDO::getId, id)
+ .eq(HrmRegularizeApplicationDO::getStatus, HrmAuditStatusEnum.PROCESS.getStatus())
+ .set(HrmRegularizeApplicationDO::getStatus, status)
+ .set(HrmRegularizeApplicationDO::getReviewTime, LocalDateTime.now())
+ .set(HrmRegularizeApplicationDO::getReviewRemark, reviewRemark));
+ }
+
default HrmRegularizeApplicationDO selectByUserIdAndStatusNot(Long userId, Integer status) {
return selectOne(new LambdaQueryWrapperX<HrmRegularizeApplicationDO>()
.eq(HrmRegularizeApplicationDO::getUserId, userId)
--
Gitblit v1.9.3