feat(aftersales): 售后退货单同步MES批次信息并优化工单处理流程

云

2026-10-25 daf9f8dbb7ba36eb283221d2c6022039aefaf97d

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

@@ -14,6 +14,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.HrmEmploymentTypeEnum;
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;
@@ -57,6 +60,11 @@
    private static final String REGULARIZE_APPROVE_BIZ_TYPE = "hrm_regularize_approve";

    /**
     * 转正申请审批的 BPM 流程定义 Key
     */
    private static final String REGULARIZE_APPROVE_PROCESS_KEY = "hrm_regularize_approve";

    /**
     * 员工状态：在职
     */
    private static final Integer EMPLOYEE_STATUS_ACTIVE = 1;
@@ -79,6 +87,8 @@
    @Resource
    private ApprovalConfigApi approvalConfigApi;
    @Resource
    private BpmProcessInstanceApi bpmProcessInstanceApi;
    @Resource
    private HrmEmployeeMapper employeeMapper;

    @Override
@@ -88,17 +98,13 @@
        if (userId == null) {
            userId = getCurrentUserId();
        }
        AdminUserRespDTO user = validateApplicant(userId);
        HrmRegularizeApplicationDO existing = regularizeApplicationMapper.selectByUserIdAndStatusNot(userId,
                HrmAuditStatusEnum.CANCEL.getStatus());
        if (existing != null) {
            throw exception(REGULARIZE_APPLICATION_EXISTS);
        }
        String no = generateUniqueNo();
        AdminUserRespDTO user = adminUserApi.getUser(userId);
        if (user == null) {
            userId = getCurrentUserId();
            user = adminUserApi.getUser(userId);
        }
        HrmRegularizeApplicationDO application = BeanUtils.toBean(createReqVO, HrmRegularizeApplicationDO.class);
        application.setNo(no);
        application.setUserId(userId);
@@ -113,6 +119,17 @@
        return SecurityFrameworkUtils.getLoginUserId();
    }

    private AdminUserRespDTO validateApplicant(Long userId) {
        AdminUserRespDTO user = userId == null ? null : adminUserApi.getUser(userId);
        if (user == null) {
            throw exception(REGULARIZE_APPLICANT_NOT_EXISTS);
        }
        if (employeeMapper.selectByUserId(userId) == null) {
            throw exception(REGULARIZE_EMPLOYEE_LINK_REQUIRED);
        }
        return user;
    }

    private String generateUniqueNo() {
        String no = noRedisDAO.generateRegularizeApplicationNo();
        if (regularizeApplicationMapper.selectByNo(no) != null) {
@@ -124,8 +141,12 @@
    @Override
    public void updateRegularizeApplication(HrmRegularizeApplicationSaveReqVO updateReqVO) {
        HrmRegularizeApplicationDO application = validateRegularizeApplicationExists(updateReqVO.getId());
        if (!Objects.equals(application.getStatus(), HrmAuditStatusEnum.DRAFT.getStatus())) {
        if (!Objects.equals(application.getStatus(), HrmAuditStatusEnum.DRAFT.getStatus())
                && !Objects.equals(application.getStatus(), HrmAuditStatusEnum.REJECT.getStatus())) {
            throw exception(REGULARIZE_APPLICATION_UPDATE_FAIL_NOT_DRAFT);
        }
        if (updateReqVO.getUserId() != null) {
            validateApplicant(updateReqVO.getUserId());
        }
        HrmRegularizeApplicationDO updateObj = BeanUtils.toBean(updateReqVO, HrmRegularizeApplicationDO.class);
        regularizeApplicationMapper.updateById(updateObj);
@@ -134,7 +155,8 @@
    @Override
    public void deleteRegularizeApplication(Long id) {
        HrmRegularizeApplicationDO application = validateRegularizeApplicationExists(id);
        if (!Objects.equals(application.getStatus(), HrmAuditStatusEnum.DRAFT.getStatus())) {
        if (!Objects.equals(application.getStatus(), HrmAuditStatusEnum.DRAFT.getStatus())
                && !Objects.equals(application.getStatus(), HrmAuditStatusEnum.REJECT.getStatus())) {
            throw exception(REGULARIZE_APPLICATION_UPDATE_FAIL_NOT_DRAFT);
        }
        regularizeApplicationMapper.deleteById(id);
@@ -236,12 +258,21 @@
                && !Objects.equals(application.getStatus(), HrmAuditStatusEnum.REJECT.getStatus())) {
            throw exception(REGULARIZE_APPLICATION_SUBMIT_FAIL_NOT_EDITABLE);
        }
        validateApplicant(application.getUserId());

        // 2. 校验审批配置已启用且配置了有效审批人（未配置时抛出带明确提示的业务异常）
        approvalConfigApi.validateApprovalEnabledAndGetApprovers(REGULARIZE_APPROVE_BIZ_TYPE);

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

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

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

        // 6. 审核通过后置业务逻辑：回写员工主档（状态=在职，用工性质=正式，转正日期 = 拟转正日期或当天）
        writeBackEmployee(application);
@@ -286,8 +321,7 @@
    private void writeBackEmployee(HrmRegularizeApplicationDO application) {
        HrmEmployeeDO employee = employeeMapper.selectByUserId(application.getUserId());
        if (employee == null) {
            log.warn("[writeBackEmployee] 转正申请({}) 用户({}) 未找到员工档案，跳过回写", application.getId(), application.getUserId());
            return;
            throw exception(REGULARIZE_EMPLOYEE_LINK_REQUIRED);
        }
        LocalDate regularDate = application.getExpectedDate() != null ? application.getExpectedDate() : LocalDate.now();
        employeeMapper.updateById(HrmEmployeeDO.builder()
@@ -296,6 +330,31 @@
                .employmentType(EMPLOYMENT_TYPE_FORMAL)
                .regularDate(regularDate)
                .build());
    }

    @Override
    @Transactional(rollbackFor = Exception.class)
    public void updateRegularizeApplicationAuditStatus(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;
        }
        HrmRegularizeApplicationDO application = regularizeApplicationMapper.selectById(id);
        if (regularizeApplicationMapper.updateAuditStatusByBpm(id, status, reason) != 1) {
            log.warn("[updateRegularizeApplicationAuditStatus] 转正申请({}) 不处于审批中状态，忽略 BPM 结果({})", id, bpmStatus);
            return;
        }
        // 审批通过后置业务逻辑：回写员工主档
        if (status.equals(HrmAuditStatusEnum.APPROVE.getStatus()) && application != null) {
            writeBackEmployee(application);
        }
    }

    /**
@@ -312,4 +371,4 @@
        return user == null ? null : user.getNickname();
    }

}
}