From 962f78c8383e7c884ddb08c951c15e5ba6eb4cb8 Mon Sep 17 00:00:00 2001
From: liu <2021943741@qq.com>
Date: 星期五, 23 十月 2026 15:43:33 +0800
Subject: [PATCH] fix: 完善审批流程与业务状态校验
---
yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/dal/mysql/approval/HrmRegularizeApplicationMapper.java | 50 ++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 48 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..1e1750d 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,50 @@
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));
}
default HrmRegularizeApplicationDO selectByUserIdAndStatusNot(Long userId, Integer status) {
--
Gitblit v1.9.3