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 | 64 +++++++++++++++++++++++++++++++-
1 files changed, 62 insertions(+), 2 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 cfd79d4..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,7 +5,11 @@
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;
+
+import java.time.LocalDateTime;
/**
* 杞鐢宠 Mapper
@@ -30,8 +34,64 @@
return selectOne(HrmRegularizeApplicationDO::getNo, no);
}
- default HrmRegularizeApplicationDO selectByProcessInstanceId(String processInstanceId) {
- return selectOne(HrmRegularizeApplicationDO::getProcessInstanceId, processInstanceId);
+ /**
+ * 鎻愪氦瀹℃壒锛氱疆涓哄鎵逛腑锛屽苟娓呯┖涓婁竴杞鏍哥粨鏋�
+ *
+ * 鐢� LambdaUpdateWrapper 鑰岄潪 updateById锛歁yBatis-Plus 榛樿鏇存柊绛栫暐蹇界暐 null锛�
+ * 鐩存帴 updateById 鏃犳硶鎶婂鏍镐笉閫氳繃鍚庢畫鐣欑殑瀹℃牳浜�/瀹℃牳鏃堕棿/瀹℃牳鎰忚娓呯┖銆�
+ *
+ * @param id 鐢宠ID
+ * @param status 鐩爣鐘舵��
+ * @return 褰卞搷琛屾暟
+ */
+ 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)
+ .set(HrmRegularizeApplicationDO::getReviewTime, null)
+ .set(HrmRegularizeApplicationDO::getReviewRemark, null));
+ }
+
+ /**
+ * 瀹℃牳锛氬啓鍏ュ鏍哥粨鏋溿�佸鏍镐汉涓庡鏍告剰瑙�
+ *
+ * reviewRemark 鍏佽涓� null锛堝鏍搁�氳繃鏃舵剰瑙佸彲閫夛級锛屾晠鍚屾牱浣跨敤 UpdateWrapper 鐩村啓銆�
+ *
+ * @param id 鐢宠ID
+ * @param status 鐩爣鐘舵�侊紙瀹℃牳閫氳繃 / 瀹℃牳涓嶉�氳繃锛�
+ * @param reviewerId 瀹℃牳浜虹紪鍙�
+ * @param reviewerName 瀹℃牳浜哄鍚�
+ * @param reviewRemark 瀹℃牳鎰忚
+ * @return 褰卞搷琛屾暟
+ */
+ default int auditRegularizeApplication(Long id, Integer status, Long reviewerId,
+ 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)
+ .set(HrmRegularizeApplicationDO::getReviewTime, LocalDateTime.now())
+ .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) {
--
Gitblit v1.9.3