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

liu

2026-10-23 5421b8af862890dcf187c2ad5ece55423959ba85

 yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/approval/HrmTransferApplicationServiceImpl.java

@@ -13,6 +13,9 @@
import cn.iocoder.yudao.module.hrm.dal.redis.HrmNoRedisDAO;
import cn.iocoder.yudao.module.hrm.enums.HrmAuditStatusEnum;
import cn.iocoder.yudao.module.hrm.enums.HrmTransferTypeEnum;
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.dept.DeptApi;
import cn.iocoder.yudao.module.system.api.dept.PostApi;
@@ -58,6 +61,11 @@
     */
    private static final String TRANSFER_APPROVE_BIZ_TYPE = "hrm_transfer_approve";

    /**
     * 调岗申请审批的 BPM 流程定义 Key
     */
    private static final String TRANSFER_APPROVE_PROCESS_KEY = "hrm_transfer_approve";

    @Resource
    private HrmTransferApplicationMapper transferApplicationMapper;
    @Resource
@@ -72,6 +80,8 @@
    private StorageAttachmentApi storageAttachmentApi;
    @Resource
    private ApprovalConfigApi approvalConfigApi;
    @Resource
    private BpmProcessInstanceApi bpmProcessInstanceApi;
    @Resource
    private HrmEmployeeMapper employeeMapper;

@@ -124,7 +134,7 @@
    public void updateTransferApplication(HrmTransferApplicationSaveReqVO updateReqVO) {
        HrmTransferApplicationDO application = validateTransferApplicationExists(updateReqVO.getId());
        if (!Objects.equals(application.getStatus(), HrmAuditStatusEnum.DRAFT.getStatus())
                && !Objects.equals(application.getStatus(), HrmAuditStatusEnum.PROCESS.getStatus())) {
                && !Objects.equals(application.getStatus(), HrmAuditStatusEnum.REJECT.getStatus())) {
            throw exception(TRANSFER_APPLICATION_UPDATE_FAIL_NOT_DRAFT);
        }
        if (Objects.equals(updateReqVO.getTargetDeptId(), updateReqVO.getCurrentDeptId())) {
@@ -265,7 +275,15 @@
        approvalConfigApi.validateApprovalEnabledAndGetApprovers(TRANSFER_APPROVE_BIZ_TYPE);

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

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

    @Override
@@ -290,13 +308,17 @@
            if (StrUtil.isBlank(reviewRemark)) {
                throw exception(TRANSFER_APPLICATION_AUDIT_REJECT_REASON_REQUIRED);
            }
            transferApplicationMapper.auditTransferApplication(id, HrmAuditStatusEnum.REJECT.getStatus(),
                    userId, getUserNickname(userId), reviewRemark);
            if (transferApplicationMapper.auditTransferApplication(id, HrmAuditStatusEnum.REJECT.getStatus(),
                    userId, getUserNickname(userId), reviewRemark) != 1) {
                throw exception(TRANSFER_APPLICATION_AUDIT_FAIL_NOT_PROCESS);
            }
            return;
        }
        // 5. 审核通过：记录审核人与审核意见，状态置为审核通过
        transferApplicationMapper.auditTransferApplication(id, HrmAuditStatusEnum.APPROVE.getStatus(),
                userId, getUserNickname(userId), reviewRemark);
        if (transferApplicationMapper.auditTransferApplication(id, HrmAuditStatusEnum.APPROVE.getStatus(),
                userId, getUserNickname(userId), reviewRemark) != 1) {
            throw exception(TRANSFER_APPLICATION_AUDIT_FAIL_NOT_PROCESS);
        }

        // 6. 审核通过后置业务逻辑：回写员工主档（部门 = 目标部门，岗位 = 目标岗位）
        writeBackEmployee(application);
@@ -320,6 +342,31 @@
                .build());
    }

    @Override
    @Transactional(rollbackFor = Exception.class)
    public void updateTransferApplicationAuditStatus(Long id, Integer bpmStatus, String reason) {
        // BPM 审批结果映射为调岗审批状态：通过=20 / 不通过=30 / 取消=40
        Integer status;
        if (BpmTaskStatusEnum.APPROVE.getStatus().equals(bpmStatus)) {
            status = HrmAuditStatusEnum.APPROVE.getStatus();
        } else if (BpmTaskStatusEnum.REJECT.getStatus().equals(bpmStatus)) {
            status = HrmAuditStatusEnum.REJECT.getStatus();
        } else if (BpmTaskStatusEnum.CANCEL.getStatus().equals(bpmStatus)) {
            status = HrmAuditStatusEnum.CANCEL.getStatus();
        } else {
            return;
        }
        HrmTransferApplicationDO application = transferApplicationMapper.selectById(id);
        if (transferApplicationMapper.updateAuditStatusByBpm(id, status, reason) != 1) {
            log.warn("[updateTransferApplicationAuditStatus] 调岗申请({}) 不处于审批中状态，忽略 BPM 结果({})", id, bpmStatus);
            return;
        }
        // 审批通过后置业务逻辑：回写员工主档
        if (status.equals(HrmAuditStatusEnum.APPROVE.getStatus()) && application != null) {
            writeBackEmployee(application);
        }
    }

    /**
     * 获取用户昵称
     *