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-crm/src/main/java/cn/iocoder/yudao/module/crm/service/cancellation/CrmCancellationServiceImpl.java | 48 ++++++++++++++++++++++++++++++++++--------------
1 files changed, 34 insertions(+), 14 deletions(-)
diff --git a/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/service/cancellation/CrmCancellationServiceImpl.java b/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/service/cancellation/CrmCancellationServiceImpl.java
index 0a3e14c..34950cf 100644
--- a/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/service/cancellation/CrmCancellationServiceImpl.java
+++ b/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/service/cancellation/CrmCancellationServiceImpl.java
@@ -17,6 +17,7 @@
import cn.iocoder.yudao.module.system.api.approval.ApprovalConfigApi;
import cn.iocoder.yudao.module.system.api.user.AdminUserApi;
import cn.iocoder.yudao.module.system.api.user.dto.AdminUserRespDTO;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import jakarta.annotation.Resource;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
@@ -78,23 +79,36 @@
@Override
public void updateCancellation(CrmCancellationSaveReqVO updateReqVO) {
- // 1. 鏍￠獙瀛樺湪 + 瀹℃牳閫氳繃鐨勯攢鎴风敵璇蜂笉鍏佽淇敼
+ // 1. 鏍￠獙瀛樺湪 + 鍙湁鑽夌銆佸鏍镐笉閫氳繃鍙互淇敼
CrmCancellationDO cancellation = validateCancellationExists(updateReqVO.getId());
- if (ObjUtil.equal(cancellation.getAuditStatus(), CrmAuditStatusEnum.APPROVE.getStatus())) {
- throw exception(ErrorCodeConstants.CRM_CANCELLATION_UPDATE_FAIL_APPROVE);
+ if (ObjUtil.notEqual(cancellation.getAuditStatus(), CrmAuditStatusEnum.DRAFT.getStatus())
+ && ObjUtil.notEqual(cancellation.getAuditStatus(), CrmAuditStatusEnum.REJECT.getStatus())) {
+ throw exception(ErrorCodeConstants.CRM_CANCELLATION_UPDATE_FAIL_NOT_EDITABLE);
}
- // 2. 鏇存柊閿�鎴风敵璇�
+ // 2. 鏇存柊閿�鎴风敵璇凤紱瀹℃壒鐘舵�佷笌瀹℃牳缁撴灉鍙兘鐢辨彁浜�/瀹℃牳鍙樻洿锛屾澶勬樉寮忔竻绌�
CrmCancellationDO entity = BeanUtils.toBean(updateReqVO, CrmCancellationDO.class);
- entity.setAuditStatus(null); // 瀹℃壒鐘舵�佸彧鑳界敱鎻愪氦/瀹℃牳鍙樻洿
- cancellationMapper.updateById(entity);
+ // 瀹℃牳鐩稿叧瀛楁鍙兘鐢辨彁浜�/瀹℃牳鍙樻洿
+ entity.setAuditStatus(null);
+ entity.setReviewerId(null);
+ entity.setReviewerName(null);
+ entity.setReviewTime(null);
+ entity.setReviewRemark(null);
+ cancellationMapper.update(entity, new LambdaUpdateWrapper<CrmCancellationDO>()
+ .eq(CrmCancellationDO::getId, entity.getId())
+ .set(CrmCancellationDO::getAuditStatus, null)
+ .set(CrmCancellationDO::getReviewerId, null)
+ .set(CrmCancellationDO::getReviewerName, null)
+ .set(CrmCancellationDO::getReviewTime, null)
+ .set(CrmCancellationDO::getReviewRemark, null));
}
@Override
public void deleteCancellation(Long id) {
- // 鏍￠獙瀛樺湪 + 瀹℃牳閫氳繃鐨勯攢鎴风敵璇蜂笉鍏佽鍒犻櫎
+ // 鏍￠獙瀛樺湪 + 鍙湁鑽夌銆佸鏍镐笉閫氳繃鍙互鍒犻櫎
CrmCancellationDO cancellation = validateCancellationExists(id);
- if (ObjUtil.equal(cancellation.getAuditStatus(), CrmAuditStatusEnum.APPROVE.getStatus())) {
- throw exception(ErrorCodeConstants.CRM_CANCELLATION_DELETE_FAIL_APPROVE);
+ if (ObjUtil.notEqual(cancellation.getAuditStatus(), CrmAuditStatusEnum.DRAFT.getStatus())
+ && ObjUtil.notEqual(cancellation.getAuditStatus(), CrmAuditStatusEnum.REJECT.getStatus())) {
+ throw exception(ErrorCodeConstants.CRM_CANCELLATION_DELETE_FAIL_NOT_EDITABLE);
}
cancellationMapper.deleteById(id);
}
@@ -129,7 +143,9 @@
approvalConfigApi.validateApprovalEnabledAndGetApprovers(CANCELLATION_APPROVE_BIZ_TYPE);
// 3. 鐘舵�佺疆涓哄鎵逛腑锛屽苟娓呯┖涓婁竴杞鏍哥粨鏋滐紝閬垮厤娈嬬暀銆屽鏍镐笉閫氳繃銆嶇殑鍘熷洜
- cancellationMapper.submitAndResetAuditInfo(id, CrmAuditStatusEnum.PROCESS.getStatus());
+ if (cancellationMapper.submitAndResetAuditInfo(id, CrmAuditStatusEnum.PROCESS.getStatus()) != 1) {
+ throw exception(ErrorCodeConstants.CRM_CANCELLATION_SUBMIT_FAIL_NOT_EDITABLE);
+ }
}
@Override
@@ -154,13 +170,17 @@
if (StrUtil.isBlank(reviewRemark)) {
throw exception(ErrorCodeConstants.CRM_CANCELLATION_AUDIT_REJECT_REASON_REQUIRED);
}
- cancellationMapper.auditCancellation(id, CrmAuditStatusEnum.REJECT.getStatus(),
- userId, getUserNickname(userId), reviewRemark);
+ if (cancellationMapper.auditCancellation(id, CrmAuditStatusEnum.REJECT.getStatus(),
+ userId, getUserNickname(userId), reviewRemark) != 1) {
+ throw exception(ErrorCodeConstants.CRM_CANCELLATION_AUDIT_FAIL_NOT_PROCESS);
+ }
return;
}
// 5. 瀹℃牳閫氳繃锛氳褰曞鏍镐汉涓庡鏍告剰瑙侊紝鐘舵�佺疆涓哄鏍搁�氳繃
- cancellationMapper.auditCancellation(id, CrmAuditStatusEnum.APPROVE.getStatus(),
- userId, getUserNickname(userId), reviewRemark);
+ if (cancellationMapper.auditCancellation(id, CrmAuditStatusEnum.APPROVE.getStatus(),
+ userId, getUserNickname(userId), reviewRemark) != 1) {
+ throw exception(ErrorCodeConstants.CRM_CANCELLATION_AUDIT_FAIL_NOT_PROCESS);
+ }
}
private CrmCancellationDO validateCancellationExists(Long id) {
--
Gitblit v1.9.3