refactor: 单据审核改为审批配置状态机（新增:audit接口/审核人字段/DB变更脚本）

liu

3 天以前 7d2ee3cef2e0d68ba6400bc5957640d2771bbf4c

 yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/contract/CrmContractController.java

@@ -10,6 +10,7 @@
import cn.iocoder.yudao.framework.common.util.number.NumberUtils;
import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
import cn.iocoder.yudao.module.crm.controller.admin.contract.vo.contract.CrmContractAuditReqVO;
import cn.iocoder.yudao.module.crm.controller.admin.contract.vo.contract.CrmContractPageReqVO;
import cn.iocoder.yudao.module.crm.controller.admin.contract.vo.contract.CrmContractRespVO;
import cn.iocoder.yudao.module.crm.controller.admin.contract.vo.contract.CrmContractSaveReqVO;
@@ -24,6 +25,7 @@
import cn.iocoder.yudao.module.mdm.api.item.dto.MdmItemRespDTO;
import cn.iocoder.yudao.module.crm.service.business.CrmBusinessService;
import cn.iocoder.yudao.module.crm.service.contact.CrmContactService;
import cn.iocoder.yudao.module.crm.service.contract.CrmContractCommandService;
import cn.iocoder.yudao.module.crm.service.contract.CrmContractService;
import cn.iocoder.yudao.module.crm.service.customer.CrmCustomerService;
import cn.iocoder.yudao.module.crm.service.invoice.CrmInvoiceService;
@@ -47,6 +49,7 @@
import java.util.Collections;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.stream.Stream;

import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.EXPORT;
@@ -74,6 +77,8 @@
    private CrmReceivableService receivableService;
    @Resource
    private CrmInvoiceService invoiceService;
    @Resource
    private CrmContractCommandService contractCommandService;

    @Resource
    private MdmItemApi mdmItemApi;
@@ -186,19 +191,27 @@
    }

    @PutMapping("/submit")
    @Operation(summary = "提交合同审批")
    @Operation(summary = "提交合同审批（未提交/审核不通过→审批中），审批人由审批配置统一指定")
    @Parameter(name = "id", description = "合同编号", required = true)
    @PreAuthorize("@ss.hasPermission('crm:contract:update')")
    public CommonResult<Boolean> submitContract(@RequestParam("id") Long id,
                                                  @RequestParam("processDefinitionKey") String processDefinitionKey) {
        contractService.submitContract(id, processDefinitionKey, getLoginUserId());
    public CommonResult<Boolean> submitContract(@RequestParam("id") Long id) {
        contractService.submitContract(id);
        return success(true);
    }

    @GetMapping("/approve-process-list")
    @Operation(summary = "获取合同审批流程列表")
    @PutMapping("/audit")
    @Operation(summary = "审核合同（审批中→审核通过/审核不通过），仅审批人本人可操作")
    @PreAuthorize("@ss.hasPermission('crm:contract:audit')")
    public CommonResult<Boolean> auditContract(@Valid @RequestBody CrmContractAuditReqVO auditReqVO) {
        contractService.auditContract(auditReqVO.getId(), auditReqVO.getPass(), auditReqVO.getReviewRemark());
        return success(true);
    }

    @GetMapping("/approver-ids")
    @Operation(summary = "获得合同的审批人编号集合，供前端判断是否展示审核按钮")
    @PreAuthorize("@ss.hasPermission('crm:contract:query')")
    public CommonResult<List<Map<String, Object>>> getContractApproveProcessList() {
        return success(contractService.getContractApproveProcessDefinitionList());
    public CommonResult<Set<Long>> getApproverUserIds() {
        return success(contractService.getContractApproverUserIds());
    }

    private List<CrmContractRespVO> buildContractDetailList(List<CrmContractDO> contractList) {
@@ -247,6 +260,9 @@
            if (contractVO.getTotalPrice() != null && contractVO.getTotalInvoicePrice() != null) {
                contractVO.setUnInvoicePrice(contractVO.getTotalPrice().subtract(contractVO.getTotalInvoicePrice()));
            }
            // 2.8 设置指令下发数量
            contractVO.setCommandCount(contractCommandService.countByContractId(contractVO.getId()));
            contractVO.setAuditStatusName(CrmAuditStatusEnum.getNameByStatus(contractVO.getAuditStatus()));
        });
    }