feat: 优化业务导入及工艺流程管理

云

2026-10-31 bf5f52656e128f578ed42c7979c31cf4b476ce46

 yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/service/cancellation/CrmCancellationServiceImpl.java

@@ -14,9 +14,13 @@
import cn.iocoder.yudao.module.crm.dal.mysql.customer.CrmCustomerMapper;
import cn.iocoder.yudao.module.crm.enums.ErrorCodeConstants;
import cn.iocoder.yudao.module.crm.enums.common.CrmAuditStatusEnum;
import cn.iocoder.yudao.module.bpm.api.task.BpmProcessInstanceApi;
import cn.iocoder.yudao.module.bpm.api.task.dto.BpmProcessInstanceCreateReqDTO;
import cn.iocoder.yudao.module.bpm.enums.task.BpmTaskStatusEnum;
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;
@@ -43,6 +47,11 @@
     */
    private static final String CANCELLATION_APPROVE_BIZ_TYPE = "cancellation_approve";

    /**
     * CRM 销户申请审批的 BPM 流程定义 Key
     */
    private static final String CANCELLATION_APPROVE_PROCESS_KEY = "cancellation_approve";

    @Resource
    private CrmCancellationMapper cancellationMapper;
    @Resource
@@ -51,6 +60,8 @@
    private AdminUserApi adminUserApi;
    @Resource
    private ApprovalConfigApi approvalConfigApi;
    @Resource
    private BpmProcessInstanceApi bpmProcessInstanceApi;

    @Override
    @Transactional(rollbackFor = Exception.class)
@@ -78,23 +89,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 +153,15 @@
        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);
        }

        // 4. 创建 BPM 流程实例，使审批出现在「协同办公 - 我的流程」
        bpmProcessInstanceApi.createProcessInstance(getLoginUserId(),
                new BpmProcessInstanceCreateReqDTO()
                        .setProcessDefinitionKey(CANCELLATION_APPROVE_PROCESS_KEY)
                        .setBusinessKey(String.valueOf(id)));
    }

    @Override
@@ -154,13 +186,36 @@
            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);
        }
    }

    @Override
    @Transactional(rollbackFor = Exception.class)
    public void updateCancellationAuditStatus(Long id, Integer bpmStatus, String reason) {
        // BPM 审批结果映射为销户申请审核状态：通过=20 / 不通过=30 / 取消=40
        Integer auditStatus;
        if (BpmTaskStatusEnum.APPROVE.getStatus().equals(bpmStatus)) {
            auditStatus = CrmAuditStatusEnum.APPROVE.getStatus();
        } else if (BpmTaskStatusEnum.REJECT.getStatus().equals(bpmStatus)) {
            auditStatus = CrmAuditStatusEnum.REJECT.getStatus();
        } else if (BpmTaskStatusEnum.CANCEL.getStatus().equals(bpmStatus)) {
            auditStatus = CrmAuditStatusEnum.CANCEL.getStatus();
        } else {
            return;
        }
        if (cancellationMapper.updateAuditStatusByBpm(id, auditStatus, reason) != 1) {
            log.warn("[updateCancellationAuditStatus] 销户申请({}) 不处于审批中状态，忽略 BPM 结果({})", id, bpmStatus);
        }
    }

    private CrmCancellationDO validateCancellationExists(Long id) {