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/performanceappraise/HrmPerformanceAppraiseMapper.java | 29 +++++++++++++++++++++++++++++
1 files changed, 29 insertions(+), 0 deletions(-)
diff --git a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/dal/mysql/performanceappraise/HrmPerformanceAppraiseMapper.java b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/dal/mysql/performanceappraise/HrmPerformanceAppraiseMapper.java
index cbb287c..c23ce49 100644
--- a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/dal/mysql/performanceappraise/HrmPerformanceAppraiseMapper.java
+++ b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/dal/mysql/performanceappraise/HrmPerformanceAppraiseMapper.java
@@ -5,6 +5,7 @@
import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
import cn.iocoder.yudao.module.hrm.controller.admin.performanceappraise.vo.HrmPerformanceAppraisePageReqVO;
import cn.iocoder.yudao.module.hrm.dal.dataobject.performanceappraise.HrmPerformanceAppraiseDO;
+import cn.iocoder.yudao.module.hrm.enums.HrmAuditStatusEnum;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import org.apache.ibatis.annotations.Mapper;
@@ -37,6 +38,8 @@
default int submitAndResetAuditInfo(Long id, Integer auditStatus) {
return update(null, new LambdaUpdateWrapper<HrmPerformanceAppraiseDO>()
.eq(HrmPerformanceAppraiseDO::getId, id)
+ .in(HrmPerformanceAppraiseDO::getAuditStatus,
+ HrmAuditStatusEnum.DRAFT.getStatus(), HrmAuditStatusEnum.REJECT.getStatus())
.set(HrmPerformanceAppraiseDO::getAuditStatus, auditStatus)
.set(HrmPerformanceAppraiseDO::getReviewerId, null)
.set(HrmPerformanceAppraiseDO::getReviewerName, null)
@@ -61,10 +64,32 @@
String reviewerName, String reviewRemark) {
return update(null, new LambdaUpdateWrapper<HrmPerformanceAppraiseDO>()
.eq(HrmPerformanceAppraiseDO::getId, id)
+ .eq(HrmPerformanceAppraiseDO::getAuditStatus, HrmAuditStatusEnum.PROCESS.getStatus())
.set(HrmPerformanceAppraiseDO::getAuditStatus, auditStatus)
.set(HrmPerformanceAppraiseDO::getStatus, status)
.set(HrmPerformanceAppraiseDO::getReviewerId, reviewerId)
.set(HrmPerformanceAppraiseDO::getReviewerName, reviewerName)
+ .set(HrmPerformanceAppraiseDO::getReviewTime, LocalDateTime.now())
+ .set(HrmPerformanceAppraiseDO::getReviewRemark, reviewRemark));
+ }
+
+ /**
+ * BPM 瀹℃壒缁撴潫鍚庡洖鍐欑哗鏁堣�冩牳鏂规瀹℃壒鐘舵��
+ *
+ * 浠呭綋鏂规浠嶅浜庛�屽鎵逛腑銆嶆椂鏇存柊锛岄伩鍏嶄笌鏃у鎵硅矾寰勯噸澶嶈鐩栥��
+ *
+ * @param id 鏂规缂栧彿
+ * @param auditStatus 鐩爣瀹℃壒鐘舵��
+ * @param status 鏂规鐘舵�侊紙瀹℃牳閫氳繃鏃剁疆涓哄凡鍙戝竷锛屽惁鍒欎繚鎸佸師鍊硷級
+ * @param reviewRemark 瀹℃牳鎰忚
+ * @return 褰卞搷琛屾暟
+ */
+ default int updateAuditStatusByBpm(Long id, Integer auditStatus, Integer status, String reviewRemark) {
+ return update(null, new LambdaUpdateWrapper<HrmPerformanceAppraiseDO>()
+ .eq(HrmPerformanceAppraiseDO::getId, id)
+ .eq(HrmPerformanceAppraiseDO::getAuditStatus, HrmAuditStatusEnum.PROCESS.getStatus())
+ .set(HrmPerformanceAppraiseDO::getAuditStatus, auditStatus)
+ .set(HrmPerformanceAppraiseDO::getStatus, status)
.set(HrmPerformanceAppraiseDO::getReviewTime, LocalDateTime.now())
.set(HrmPerformanceAppraiseDO::getReviewRemark, reviewRemark));
}
@@ -78,4 +103,8 @@
.last("LIMIT 1"));
}
+ default HrmPerformanceAppraiseDO selectByName(String name) {
+ return selectOne(HrmPerformanceAppraiseDO::getName, name);
+ }
+
}
--
Gitblit v1.9.3