feat(bpm): 全部业务审批流改回 BPM，审批统一进入协同办公

liu

2026-10-23 5421b8af862890dcf187c2ad5ece55423959ba85

 yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pd/project/MesPdProjectServiceImpl.java

@@ -1,14 +1,14 @@
package cn.iocoder.yudao.module.mes.service.pd.project;

import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.ObjUtil;
import cn.hutool.core.util.StrUtil;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
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.dal.dataobject.definition.BpmCategoryDO;
import cn.iocoder.yudao.module.bpm.dal.dataobject.definition.BpmProcessDefinitionInfoDO;
import cn.iocoder.yudao.module.bpm.enums.task.BpmTaskStatusEnum;
import cn.iocoder.yudao.module.bpm.service.definition.BpmCategoryService;
import cn.iocoder.yudao.module.bpm.service.definition.BpmProcessDefinitionService;
import cn.iocoder.yudao.module.mes.controller.admin.pd.project.vo.MesPdProjectImportExcelVO;
import cn.iocoder.yudao.module.mes.controller.admin.pd.project.vo.MesPdProjectImportRespVO;
import cn.iocoder.yudao.module.mes.controller.admin.pd.project.vo.MesPdProjectPageReqVO;
import cn.iocoder.yudao.module.mes.controller.admin.pd.project.vo.MesPdProjectSaveReqVO;
import cn.iocoder.yudao.module.mes.dal.dataobject.pd.document.MesPdDocumentDO;
@@ -22,10 +22,12 @@
import cn.iocoder.yudao.module.mes.enums.pd.MesPdProjectStatusEnum;
import cn.iocoder.yudao.module.mes.service.md.autocode.MesMdAutoCodeRecordService;
import cn.iocoder.yudao.module.mes.service.pd.document.MesPdDocumentService;
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.query.QueryWrapper;
import jakarta.annotation.Resource;
import lombok.extern.slf4j.Slf4j;
import org.flowable.engine.repository.ProcessDefinition;
import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -34,10 +36,11 @@
import java.time.LocalDateTime;
import java.util.ArrayList;
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;
import java.util.concurrent.atomic.AtomicInteger;

import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertMap;
@@ -55,12 +58,22 @@
public class MesPdProjectServiceImpl implements MesPdProjectService {

    /**
     * BPM 产品项目审批分类编码
     * 设计项目审批的业务类型编码
     *
     * 与 system_approval_config.biz_type 对应，审核人在「系统管理 - 审批配置」中维护。
     */
    private static final String BPM_PROCESS_DEFINITION_CATEGORY_CODE = "mes_pd_project_approve";
    private static final String PROJECT_APPROVE_BIZ_TYPE = "mes_pd_project_approve";

    /**
     * 设计项目审批的 BPM 流程定义 Key
     */
    private static final String PROJECT_APPROVE_PROCESS_KEY = "mes-pd-project-audit";

    @Resource
    private MesPdProjectMapper projectMapper;

    @Resource
    private BpmProcessInstanceApi bpmProcessInstanceApi;

    @Resource
    @Lazy
@@ -77,13 +90,10 @@
    private MesMdAutoCodeRecordService autoCodeRecordService;

    @Resource
    private BpmProcessInstanceApi processInstanceApi;
    private AdminUserApi adminUserApi;

    @Resource
    private BpmCategoryService bpmCategoryService;

    @Resource
    private BpmProcessDefinitionService bpmProcessDefinitionService;
    private ApprovalConfigApi approvalConfigApi;

    @Override
    @Transactional(rollbackFor = Exception.class)
@@ -210,7 +220,7 @@

    @Override
    @Transactional(rollbackFor = Exception.class)
    public void submitProjectApproval(Long id, String processDefinitionKey) {
    public void submitProjectApproval(Long id) {
        // 1. 校验存在 + 待审核状态
        MesPdProjectDO project = validateProjectExists(id);
        if (!MesPdProjectStatusEnum.UPLOAD.getStatus().equals(project.getStatus())) {
@@ -218,93 +228,86 @@
        }
        // 2. 校验该项目下所有资料审核记录均已审核（不存在待审核的记录）
        List<MesPdDocumentDO> documents = documentService.getDocumentListByProjectId(id);
        if (CollUtil.isEmpty(documents)) {
            throw exception(PD_PROJECT_NO_DOCUMENT);
        }
        List<Long> documentIds = documents.stream().map(MesPdDocumentDO::getId).toList();
        if (documentAuditMapper.existsPendingAuditByDocumentIds(documentIds)) {
            throw exception(PD_PROJECT_AUDIT_NOT_FINISHED);
        }
        // 3. 创建 BPM 流程实例
        String processInstanceId = processInstanceApi.createProcessInstance(getLoginUserId(),
        // 3. 校验审批配置已启用且配置了有效审核人（未配置时抛出带明确提示的业务异常）
        approvalConfigApi.validateApprovalEnabledAndGetApprovers(PROJECT_APPROVE_BIZ_TYPE);
        // 4. 状态置为审批中，并清空上一轮审核结果
        projectMapper.submitAndResetAuditInfo(id, MesPdProjectStatusEnum.APPROVING.getStatus());
        // 5. 创建 BPM 流程实例，使审批出现在「协同办公 - 我的流程」
        bpmProcessInstanceApi.createProcessInstance(getLoginUserId(),
                new BpmProcessInstanceCreateReqDTO()
                        .setProcessDefinitionKey(processDefinitionKey)
                        .setProcessDefinitionKey(PROJECT_APPROVE_PROCESS_KEY)
                        .setBusinessKey(String.valueOf(id)));
        // 4. 更新项目状态为审批中
        projectMapper.updateById(MesPdProjectDO.builder()
                .id(id)
                .status(MesPdProjectStatusEnum.APPROVING.getStatus())
                .processInstanceId(processInstanceId)
                .processDefinitionKey(processDefinitionKey)
                .build());
    }

    @Override
    public List<Map<String, Object>> getProjectApproveProcessDefinitionList() {
        // 1. 校验分类是否存在
        List<BpmCategoryDO> categories = bpmCategoryService.getCategoryListByCode(
                Collections.singletonList(BPM_PROCESS_DEFINITION_CATEGORY_CODE));
        if (CollUtil.isEmpty(categories)) {
            throw exception(PD_PROJECT_BPM_CATEGORY_NOT_EXISTS);
        }
        // 2. 获取分类下的流程定义信息
        List<BpmProcessDefinitionInfoDO> definitionInfoList = bpmProcessDefinitionService
                .getProcessDefinitionInfoListByCategory(BPM_PROCESS_DEFINITION_CATEGORY_CODE);
        if (CollUtil.isEmpty(definitionInfoList)) {
            return Collections.emptyList();
        }
        // 3. 过滤激活状态，保留最新版本
        Map<String, ProcessDefinition> latestVersionMap = new HashMap<>();
        for (BpmProcessDefinitionInfoDO info : definitionInfoList) {
            ProcessDefinition pd = bpmProcessDefinitionService.getProcessDefinition(info.getProcessDefinitionId());
            if (pd == null || pd.isSuspended()) {
                continue;
            }
            ProcessDefinition existing = latestVersionMap.get(pd.getKey());
            if (existing == null || pd.getVersion() > existing.getVersion()) {
                latestVersionMap.put(pd.getKey(), pd);
            }
        }
        // 4. 返回流程定义列表
        List<Map<String, Object>> result = new ArrayList<>();
        for (ProcessDefinition pd : latestVersionMap.values()) {
            Map<String, Object> item = new HashMap<>();
            item.put("id", pd.getId());
            item.put("key", pd.getKey());
            item.put("name", pd.getName());
            result.add(item);
        }
        return result;
    }

    @Override
    @Transactional(rollbackFor = Exception.class)
    public void updateProjectAuditStatus(Long id, Integer bpmResult) {
        // 1. 校验存在
        MesPdProjectDO project = validateProjectExists(id);
        if (!MesPdProjectStatusEnum.APPROVING.getStatus().equals(project.getStatus())) {
            log.warn("[updateProjectAuditStatus] 设计项目({}) 不处于审批中状态，当前状态：{}", id, project.getStatus());
    public void updateProjectAuditStatus(Long id, Integer bpmStatus, String reason) {
        // BPM 审批结果映射为项目状态：通过=待归档 / 不通过=待审核（可修改后重新提交）
        Integer status;
        if (BpmTaskStatusEnum.APPROVE.getStatus().equals(bpmStatus)) {
            status = MesPdProjectStatusEnum.AUDIT.getStatus();
        } else if (BpmTaskStatusEnum.REJECT.getStatus().equals(bpmStatus)) {
            status = MesPdProjectStatusEnum.UPLOAD.getStatus();
        } else {
            // 设计项目没有「已取消」状态，其余 BPM 结果（如撤消）忽略
            log.warn("[updateProjectAuditStatus] 忽略不支持的 BPM 状态({})，projectId={}", bpmStatus, id);
            return;
        }
        // 2. 根据审批结果更新状态
        Integer newStatus = convertBpmResultToProjectStatus(bpmResult);
        if (newStatus != null) {
            projectMapper.updateById(MesPdProjectDO.builder()
                    .id(id)
                    .status(newStatus)
                    .build());
        if (projectMapper.updateAuditStatusByBpm(id, status, reason) != 1) {
            log.warn("[updateProjectAuditStatus] 设计项目({}) 不处于审批中状态，忽略 BPM 结果({})", id, bpmStatus);
        }
    }

    /**
     * 转换 BPM 审批结果为设计项目状态
     */
    private Integer convertBpmResultToProjectStatus(Integer bpmResult) {
        if (BpmTaskStatusEnum.APPROVE.getStatus().equals(bpmResult)) {
            return MesPdProjectStatusEnum.AUDIT.getStatus();
        } else if (BpmTaskStatusEnum.REJECT.getStatus().equals(bpmResult)) {
            return MesPdProjectStatusEnum.UPLOAD.getStatus();
        } else if (BpmTaskStatusEnum.CANCEL.getStatus().equals(bpmResult)) {
            return MesPdProjectStatusEnum.UPLOAD.getStatus();
    @Override
    public Set<Long> getProjectApproverUserIds() {
        return approvalConfigApi.getApproverUserIds(PROJECT_APPROVE_BIZ_TYPE);
    }

    @Override
    @Transactional(rollbackFor = Exception.class)
    public void auditProject(Long id, Boolean pass, String reviewRemark) {
        // 1. 校验存在
        MesPdProjectDO project = validateProjectExists(id);
        // 2. 校验处于审批中状态
        if (!MesPdProjectStatusEnum.APPROVING.getStatus().equals(project.getStatus())) {
            throw exception(PD_PROJECT_NOT_APPROVING);
        }
        return null;
        // 3. 校验当前登录用户是该业务类型的审核人（或签：任一人均可审核）
        Long userId = getLoginUserId();
        approvalConfigApi.validateApprover(PROJECT_APPROVE_BIZ_TYPE, userId);
        // 4. 审核不通过：必须填写原因，退回待审核状态，可修改后重新提交
        if (!Boolean.TRUE.equals(pass)) {
            if (StrUtil.isBlank(reviewRemark)) {
                throw exception(PD_PROJECT_AUDIT_REJECT_REASON_REQUIRED);
            }
            projectMapper.auditProject(id, MesPdProjectStatusEnum.UPLOAD.getStatus(),
                    userId, getUserNickname(userId), reviewRemark);
            return;
        }
        // 5. 审核通过：记录审核人与审核意见，状态置为待归档
        projectMapper.auditProject(id, MesPdProjectStatusEnum.AUDIT.getStatus(),
                userId, getUserNickname(userId), reviewRemark);
    }

    /**
     * 获取用户昵称
     *
     * @param userId 用户编号
     * @return 昵称，用户不存在时返回 null
     */
    private String getUserNickname(Long userId) {
        if (userId == null) {
            return null;
        }
        AdminUserRespDTO user = adminUserApi.getUser(userId);
        return user == null ? null : user.getNickname();
    }

    @Override
@@ -364,6 +367,76 @@
        }
    }

    @Override
    @Transactional(rollbackFor = Exception.class)
    public MesPdProjectImportRespVO importProjectList(List<MesPdProjectImportExcelVO> importList,
                                                      boolean updateSupport) {
        // 1. 校验非空
        if (CollUtil.isEmpty(importList)) {
            throw exception(PD_PROJECT_IMPORT_LIST_IS_EMPTY);
        }

        // 2. 逐行处理
        MesPdProjectImportRespVO respVO = MesPdProjectImportRespVO.builder()
                .createCodes(new ArrayList<>()).updateCodes(new ArrayList<>())
                .failureCodes(new LinkedHashMap<>()).build();
        AtomicInteger index = new AtomicInteger(1);
        importList.forEach(importItem -> {
            int currentIndex = index.getAndIncrement();
            String key = StrUtil.blankToDefault(importItem.getTaskCode(), "第 " + currentIndex + " 行");
            if (StrUtil.isBlank(importItem.getTaskCode())) {
                respVO.getFailureCodes().put(key, "任务编码不能为空");
                return;
            }
            if (StrUtil.isBlank(importItem.getTaskName())) {
                respVO.getFailureCodes().put(key, "任务名称不能为空");
                return;
            }
            // 2.1 判断：创建 or 更新
            MesPdProjectDO existProject = projectMapper.selectByTaskCode(importItem.getTaskCode());
            if (existProject == null) {
                // 2.1.1 新增（复用 create 的状态初始化逻辑）
                MesPdProjectDO project = MesPdProjectDO.builder()
                        .taskCode(importItem.getTaskCode())
                        .taskName(importItem.getTaskName())
                        .productCode(importItem.getProductCode())
                        .productName(importItem.getProductName())
                        .version(importItem.getVersion())
                        .status(MesPdProjectStatusEnum.INITIATE.getStatus())
                        .chiefDesigner(importItem.getChiefDesigner())
                        .reviewer(importItem.getReviewer())
                        .planFinishTime(importItem.getPlanFinishTime())
                        .remark(importItem.getRemark())
                        .build();
                projectMapper.insert(project);
                respVO.getCreateCodes().add(importItem.getTaskCode());
            } else if (updateSupport) {
                // 2.1.2 更新（仅待发布状态可更新）
                if (ObjUtil.notEqual(MesPdProjectStatusEnum.INITIATE.getStatus(), existProject.getStatus())) {
                    respVO.getFailureCodes().put(key, "仅待发布状态的设计项目可更新");
                    return;
                }
                MesPdProjectDO updateObj = MesPdProjectDO.builder()
                        .id(existProject.getId())
                        .taskCode(importItem.getTaskCode())
                        .taskName(importItem.getTaskName())
                        .productCode(importItem.getProductCode())
                        .productName(importItem.getProductName())
                        .version(importItem.getVersion())
                        .chiefDesigner(importItem.getChiefDesigner())
                        .reviewer(importItem.getReviewer())
                        .planFinishTime(importItem.getPlanFinishTime())
                        .remark(importItem.getRemark())
                        .build();
                projectMapper.updateById(updateObj);
                respVO.getUpdateCodes().add(importItem.getTaskCode());
            } else {
                respVO.getFailureCodes().put(key, "任务编码已存在");
            }
        });
        return respVO;
    }

    /**
     * 生成审核单号（使用编码规则）
     */