宁夏三级mom后端
blame | 历史 | 补丁 | 提交 | 提交对比 | 忽略空白
tuqin
2 天以前 52e4ba6897d5d808c4ed08720bbebad9cb006103 
 yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/approval/HrmResignationApplicationServiceImpl.java


@@ -2,6 +2,7 @@




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.framework.common.util.object.BeanUtils;


import cn.iocoder.yudao.module.bpm.api.task.BpmProcessInstanceApi;


@@ -18,6 +19,7 @@


import cn.iocoder.yudao.module.hrm.dal.redis.HrmNoRedisDAO;


import cn.iocoder.yudao.module.hrm.enums.HrmAuditStatusEnum;


import cn.iocoder.yudao.module.hrm.enums.HrmResignationTypeEnum;


import cn.iocoder.yudao.module.hrm.service.employee.HrmEmployeeService;


import cn.iocoder.yudao.module.hrm.service.handover.HrmUserHandoverService;


import cn.iocoder.yudao.module.system.api.dept.DeptApi;


import cn.iocoder.yudao.module.system.api.dept.dto.DeptRespDTO;


@@ -33,6 +35,7 @@




import java.util.ArrayList;


import java.util.Collections;


import java.util.Comparator;


import java.util.HashMap;


import java.util.List;


import java.util.Map;


@@ -48,7 +51,7 @@


/**


 * 离职申请 Service 实现类


 *


 * @author 芋道源码


 * @author 超级管理员


 */


@Service


@Validated


@@ -77,6 +80,8 @@


    private BpmProcessDefinitionService bpmProcessDefinitionService;


    @Resource


    private HrmUserHandoverService handoverService;


    @Resource


    private HrmEmployeeService employeeService;




    @Override


    @Transactional(rollbackFor = Exception.class)


@@ -93,12 +98,17 @@


        String no = generateUniqueNo();


        AdminUserRespDTO user = adminUserApi.getUser(userId);


        if (user == null) {


            // 传入的可能不是系统用户ID（例如员工ID），回退到当前登录用户并重新查询，避免后续 NPE


            userId = getCurrentUserId();


            user = adminUserApi.getUser(userId);


        }


        HrmResignationApplicationDO application = BeanUtils.toBean(createReqVO, HrmResignationApplicationDO.class);


        application.setNo(no);


        application.setUserId(userId);


        application.setDeptId(createReqVO.getDeptId() != null ? createReqVO.getDeptId() : user.getDeptId());


        // 部门：优先取请求参数，其次取账号所属部门，最后兜底 0（该列 NOT NULL）


        Long deptId = createReqVO.getDeptId() != null ? createReqVO.getDeptId()


                : (user != null ? user.getDeptId() : null);


        application.setDeptId(deptId != null ? deptId : 0L);


        application.setStatus(HrmAuditStatusEnum.DRAFT.getStatus());


        application.setHandoverStatus(HANDOVER_STATUS_NOT_STARTED);


        resignationApplicationMapper.insert(application);


@@ -245,17 +255,40 @@


            throw exception(RESIGNATION_APPLICATION_SUBMIT_FAIL_NOT_DRAFT);


        }


        validateApproveCategoryAndProcessDefinition();


        ProcessDefinition processDefinition = bpmProcessDefinitionService.getActiveProcessDefinition(processDefinitionKey);


        // 未指定流程定义 Key 时，自动取「离职审批」分类下最新的活跃流程，避免前端未传 key 直接报系统异常


        String key = resolveProcessDefinitionKey(processDefinitionKey);


        ProcessDefinition processDefinition = bpmProcessDefinitionService.getActiveProcessDefinition(key);


        if (processDefinition == null) {


            throw exception(RESIGNATION_APPLICATION_BPM_PROCESS_DEFINITION_NOT_EXISTS);


        }


        String processInstanceId = bpmProcessInstanceApi.createProcessInstance(userId, new BpmProcessInstanceCreateReqDTO()


                .setProcessDefinitionKey(processDefinitionKey).setBusinessKey(String.valueOf(id)));


                .setProcessDefinitionKey(key).setBusinessKey(String.valueOf(id)));


        resignationApplicationMapper.updateById(HrmResignationApplicationDO.builder()


                .id(id)


                .processInstanceId(processInstanceId)


                .status(HrmAuditStatusEnum.PROCESS.getStatus())


                .build());


    }




    /**


     * 解析流程定义 Key：优先使用调用方传入值，为空时取「离职审批」分类下最新的活跃流程


     */


    private String resolveProcessDefinitionKey(String processDefinitionKey) {


        if (StrUtil.isNotBlank(processDefinitionKey)) {


            return processDefinitionKey.trim();


        }


        List<BpmProcessDefinitionInfoDO> definitionInfoList = bpmProcessDefinitionService


                .getProcessDefinitionInfoListByCategory(APPROVE_CATEGORY_CODE);


        if (CollUtil.isEmpty(definitionInfoList)) {


            throw exception(RESIGNATION_APPLICATION_BPM_PROCESS_DEFINITION_NOT_EXISTS);


        }


        Set<String> processDefinitionIds = convertSet(definitionInfoList, BpmProcessDefinitionInfoDO::getProcessDefinitionId);


        List<ProcessDefinition> processDefinitions = bpmProcessDefinitionService.getProcessDefinitionList(processDefinitionIds);


        return processDefinitions.stream()


                .filter(pd -> !pd.isSuspended())


                .max(Comparator.comparingInt(ProcessDefinition::getVersion))


                .map(ProcessDefinition::getKey)


                .orElseThrow(() -> exception(RESIGNATION_APPLICATION_BPM_PROCESS_DEFINITION_NOT_EXISTS));


    }




    private void validateApproveCategoryAndProcessDefinition() {


@@ -316,6 +349,11 @@


                .status(status)


                .approveTime(java.time.LocalDateTime.now())


                .build());


        // 审批通过：立即同步到人员信息（客户要求「审批通过立即生效」）


        // 离职申请单的 userId 存的是 system_users.id，不是 hrm_employee.id


        if (HrmAuditStatusEnum.APPROVE.getStatus().equals(status)) {


            employeeService.syncEmployeeResignation(application.getUserId(), application.getActualDate());


        }


    }




    @Override