fix: 修复导出表头缺失、权限码不一致及生产链路断点

liu

2026-10-27 17ce55a3b038ed61d332bb54916de4fa55ba19c6

 yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/service/contract/CrmContractServiceImpl.java

@@ -5,20 +5,27 @@
import cn.hutool.core.lang.Assert;
import cn.hutool.core.util.ObjUtil;
import cn.hutool.core.util.StrUtil;
import cn.hutool.extra.spring.SpringUtil;
import cn.iocoder.yudao.framework.common.exception.ServiceException;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.framework.common.util.number.MoneyUtils;
import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
import cn.iocoder.yudao.framework.common.util.object.ObjectUtils;
import cn.iocoder.yudao.module.crm.controller.admin.contract.vo.contract.CrmContractImportExcelVO;
import cn.iocoder.yudao.module.crm.controller.admin.contract.vo.contract.CrmContractImportReqVO;
import cn.iocoder.yudao.module.crm.controller.admin.contract.vo.contract.CrmContractImportRespVO;
import cn.iocoder.yudao.module.crm.controller.admin.contract.vo.contract.CrmContractPageReqVO;
import cn.iocoder.yudao.module.crm.controller.admin.contract.vo.contract.CrmContractSaveReqVO;
import cn.iocoder.yudao.module.crm.controller.admin.contract.vo.contract.CrmContractTransferReqVO;
import cn.iocoder.yudao.module.crm.dal.dataobject.contract.CrmContractConfigDO;
import cn.iocoder.yudao.module.crm.dal.dataobject.contract.CrmContractDO;
import cn.iocoder.yudao.module.crm.dal.dataobject.contract.CrmContractProductDO;
import cn.iocoder.yudao.module.crm.dal.dataobject.customer.CrmCustomerDO;
import cn.iocoder.yudao.module.crm.dal.dataobject.quotation.CrmSaleQuotationDO;
import cn.iocoder.yudao.module.crm.dal.dataobject.quotation.CrmSaleQuotationProductDO;
import cn.iocoder.yudao.module.crm.dal.mysql.contract.CrmContractMapper;
import cn.iocoder.yudao.module.crm.dal.mysql.contract.CrmContractProductMapper;
import cn.iocoder.yudao.module.crm.dal.mysql.customer.CrmCustomerMapper;
import cn.iocoder.yudao.module.crm.dal.redis.no.CrmNoRedisDAO;
import cn.iocoder.yudao.module.crm.enums.common.CrmAuditStatusEnum;
import cn.iocoder.yudao.module.crm.enums.common.CrmBizTypeEnum;
@@ -33,6 +40,9 @@
import cn.iocoder.yudao.module.crm.service.permission.bo.CrmPermissionTransferReqBO;
import cn.iocoder.yudao.module.crm.service.quotation.CrmSaleQuotationService;
import cn.iocoder.yudao.module.crm.service.receivable.CrmReceivableService;
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.erp.api.sale.ErpSaleOrderApi;
import cn.iocoder.yudao.module.erp.api.sale.dto.ErpSaleOrderCreateReqDTO;
import cn.iocoder.yudao.module.erp.api.sale.dto.ErpSaleOrderRespDTO;
@@ -57,6 +67,7 @@
import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import java.util.Set;
@@ -84,10 +95,17 @@
     */
    private static final String CONTRACT_APPROVE_BIZ_TYPE = "contract_approve";

    /**
     * CRM 合同审批的 BPM 流程定义 Key
     */
    private static final String CONTRACT_APPROVE_PROCESS_KEY = "contract_approve";

    @Resource
    private CrmContractMapper contractMapper;
    @Resource
    private CrmContractProductMapper contractProductMapper;
    @Resource
    private CrmCustomerMapper customerMapper;

    @Resource
    private CrmNoRedisDAO noRedisDAO;
@@ -111,6 +129,8 @@
    private AdminUserApi adminUserApi;
    @Resource
    private ApprovalConfigApi approvalConfigApi;
    @Resource
    private BpmProcessInstanceApi bpmProcessInstanceApi;
    @Resource
    private ErpSaleOrderApi saleOrderApi;
    @Resource
@@ -166,9 +186,9 @@
        updateReqVO.setOwnerUserId(null); // 不允许更新的字段
        // 1.1 校验存在
        CrmContractDO oldContract = validateContractExists(updateReqVO.getId());
        // 1.2 只有草稿、审批中，可以编辑；
        // 1.2 只有草稿、审核不通过，可以编辑；
        if (!ObjectUtils.equalsAny(oldContract.getAuditStatus(), CrmAuditStatusEnum.DRAFT.getStatus(),
                CrmAuditStatusEnum.PROCESS.getStatus())) {
                CrmAuditStatusEnum.REJECT.getStatus())) {
            throw exception(CONTRACT_UPDATE_FAIL_NOT_DRAFT);
        }
        // 1.3 校验产品项的有效性
@@ -262,7 +282,12 @@
    public void deleteContract(Long id) {
        // 1.1 校验存在
        CrmContractDO contract = validateContractExists(id);
        // 1.2 如果被 CrmReceivableDO 所使用，则不允许删除
        // 1.2 只有草稿、审核不通过，可以删除；
        if (!ObjectUtils.equalsAny(contract.getAuditStatus(), CrmAuditStatusEnum.DRAFT.getStatus(),
                CrmAuditStatusEnum.REJECT.getStatus())) {
            throw exception(CONTRACT_DELETE_FAIL_NOT_EDITABLE);
        }
        // 1.3 如果被 CrmReceivableDO 所使用，则不允许删除
        if (receivableService.getReceivableCountByContractId(contract.getId()) > 0) {
            throw exception(CONTRACT_DELETE_FAIL);
        }
@@ -341,6 +366,7 @@
    @Transactional(rollbackFor = Exception.class)
    @LogRecord(type = CRM_CONTRACT_TYPE, subType = CRM_CONTRACT_SUBMIT_SUB_TYPE, bizNo = "{{#id}}",
            success = CRM_CONTRACT_SUBMIT_SUCCESS)
    @CrmPermission(bizType = CrmBizTypeEnum.CRM_CONTRACT, bizId = "#id", level = CrmPermissionLevelEnum.WRITE)
    public void submitContract(Long id) {
        // 1. 校验存在 + 可提交状态（未提交 / 审核不通过）
        CrmContractDO contract = validateContractExists(id);
@@ -353,9 +379,17 @@
        approvalConfigApi.validateApprovalEnabledAndGetApprovers(CONTRACT_APPROVE_BIZ_TYPE);

        // 3. 状态置为审批中，并清空上一轮审核结果，避免残留「审核不通过」的原因
        contractMapper.submitAndResetAuditInfo(id, CrmAuditStatusEnum.PROCESS.getStatus());
        if (contractMapper.submitAndResetAuditInfo(id, CrmAuditStatusEnum.PROCESS.getStatus()) != 1) {
            throw exception(CONTRACT_SUBMIT_FAIL_NOT_EDITABLE);
        }

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

        // 5. 记录日志
        LogRecordContext.putVariable("contractName", contract.getName());
    }

@@ -381,13 +415,36 @@
            if (StrUtil.isBlank(reviewRemark)) {
                throw exception(CONTRACT_AUDIT_REJECT_REASON_REQUIRED);
            }
            contractMapper.auditContract(id, CrmAuditStatusEnum.REJECT.getStatus(),
                    userId, getUserNickname(userId), reviewRemark);
            if (contractMapper.auditContract(id, CrmAuditStatusEnum.REJECT.getStatus(),
                    userId, getUserNickname(userId), reviewRemark) != 1) {
                throw exception(CONTRACT_AUDIT_FAIL_NOT_PROCESS);
            }
            return;
        }
        // 5. 审核通过：记录审核人与审核意见，状态置为审核通过
        contractMapper.auditContract(id, CrmAuditStatusEnum.APPROVE.getStatus(),
                userId, getUserNickname(userId), reviewRemark);
        if (contractMapper.auditContract(id, CrmAuditStatusEnum.APPROVE.getStatus(),
                userId, getUserNickname(userId), reviewRemark) != 1) {
            throw exception(CONTRACT_AUDIT_FAIL_NOT_PROCESS);
        }
    }

    @Override
    @Transactional(rollbackFor = Exception.class)
    public void updateContractAuditStatus(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 (contractMapper.updateAuditStatusByBpm(id, auditStatus, reason) != 1) {
            log.warn("[updateContractAuditStatus] 合同({}) 不处于审批中状态，忽略 BPM 结果({})", id, bpmStatus);
        }
    }

    // ======================= 查询相关 =======================
@@ -522,6 +579,10 @@
                    item.setProductId(cp.getItemId());
                    item.setProductPrice(cp.getContractPrice());
                    item.setCount(cp.getCount());
                    // 合同产品默认需要生产：订单审批通过后才能自动创建 MPS，
                    // 否则「合同 → 订单 → 生产」链路在合同来源的订单上会断掉。
                    // 若个别产品为外购/转售，可在销售订单明细中把「需要生产」改为否。
                    item.setNeedProduction(1);
                    return item;
                })
                .toList();
@@ -561,4 +622,102 @@
        }
    }

    @Override
    @Transactional(rollbackFor = Exception.class)
    public CrmContractImportRespVO importContractList(List<CrmContractImportExcelVO> importContracts,
                                                      CrmContractImportReqVO importReqVO) {
        // 1. 校验非空
        importContracts = filterList(importContracts, item -> StrUtil.isNotBlank(item.getName()));
        if (CollUtil.isEmpty(importContracts)) {
            throw exception(CONTRACT_IMPORT_LIST_IS_EMPTY);
        }
        // 2. 校验负责人（为空则默认当前操作人）
        Long ownerUserId = importReqVO.getOwnerUserId() != null ? importReqVO.getOwnerUserId() : getLoginUserId();
        adminUserApi.validateUser(ownerUserId);

        // 3. 逐条处理
        CrmContractImportRespVO respVO = CrmContractImportRespVO.builder()
                .createContractNames(new ArrayList<>())
                .updateContractNames(new ArrayList<>())
                .failureContractNames(new LinkedHashMap<>())
                .build();
        importContracts.forEach(importContract -> {
            try {
                // 3.1 解析客户
                CrmCustomerDO customer = customerMapper.selectByCustomerName(importContract.getCustomerName());
                if (customer == null) {
                    throw exception(CONTRACT_IMPORT_CUSTOMER_NOT_EXISTS, importContract.getCustomerName());
                }
                // 3.2 判断是否存在
                CrmContractDO existContract = contractMapper.selectByNameAndCustomerId(
                        importContract.getName(), customer.getId());
                if (existContract == null) {
                    // 3.2.1 新增
                    String no = noRedisDAO.generate(CrmNoRedisDAO.CONTRACT_NO_PREFIX);
                    if (contractMapper.selectByNo(no) != null) {
                        throw exception(CONTRACT_NO_EXISTS);
                    }
                    CrmContractDO contract = BeanUtils.toBean(importContract, CrmContractDO.class)
                            .setCustomerId(customer.getId()).setOwnerUserId(ownerUserId)
                            .setNo(no).setAuditStatus(CrmAuditStatusEnum.DRAFT.getStatus());
                    if (contract.getOrderDate() == null) {
                        contract.setOrderDate(LocalDateTime.now());
                    }
                    if (contract.getDiscountPercent() == null) {
                        contract.setDiscountPercent(BigDecimal.ZERO);
                    }
                    if (contract.getTotalPrice() == null) {
                        calculateTotalPrice(contract, Collections.emptyList());
                    }
                    contractMapper.insert(contract);
                    // 创建数据权限
                    crmPermissionService.createPermission(new CrmPermissionCreateReqBO()
                            .setBizType(CrmBizTypeEnum.CRM_CONTRACT.getType()).setBizId(contract.getId())
                            .setUserId(ownerUserId).setLevel(CrmPermissionLevelEnum.OWNER.getLevel()));
                    respVO.getCreateContractNames().add(importContract.getName());
                    // 记录操作日志
                    getSelf().importContractLog(contract, false);
                    return;
                }
                // 3.2.2 已存在，判断是否允许更新
                if (!importReqVO.getUpdateSupport()) {
                    respVO.getFailureContractNames().put(importContract.getName(),
                            StrUtil.format(CONTRACT_NAME_EXISTS.getMsg(), importContract.getName()));
                    return;
                }
                CrmContractDO updateContract = BeanUtils.toBean(importContract, CrmContractDO.class)
                        .setId(existContract.getId()).setCustomerId(customer.getId());
                contractMapper.updateById(updateContract);
                respVO.getUpdateContractNames().add(importContract.getName());
                // 记录操作日志
                getSelf().importContractLog(updateContract, true);
            } catch (ServiceException ex) {
                respVO.getFailureContractNames().put(importContract.getName(), ex.getMessage());
            }
        });
        return respVO;
    }

    /**
     * 记录导入合同时的操作日志
     *
     * @param contract 合同信息
     * @param isUpdate 是否更新；true - 更新，false - 新增
     */
    @LogRecord(type = CRM_CONTRACT_TYPE, subType = CRM_CONTRACT_IMPORT_SUB_TYPE, bizNo = "{{#contract.id}}",
            success = CRM_CONTRACT_IMPORT_SUCCESS)
    public void importContractLog(CrmContractDO contract, boolean isUpdate) {
        LogRecordContext.putVariable("contract", contract);
        LogRecordContext.putVariable("isUpdate", isUpdate);
    }

    /**
     * 获得自身的代理对象，解决 AOP 生效问题
     *
     * @return 自己
     */
    private CrmContractServiceImpl getSelf() {
        return SpringUtil.getBean(getClass());
    }

}