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


@@ -1,14 +1,17 @@


package cn.iocoder.yudao.module.hrm.service.approval;




import cn.hutool.core.collection.CollUtil;


import cn.hutool.core.util.StrUtil;


import cn.hutool.core.util.ObjUtil;


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;


import cn.iocoder.yudao.module.bpm.controller.admin.task.vo.instance.BpmProcessInstanceCancelReqVO;


import cn.iocoder.yudao.module.bpm.api.task.dto.BpmProcessInstanceCreateReqDTO;


import cn.iocoder.yudao.module.bpm.dal.dataobject.definition.BpmProcessDefinitionInfoDO;


import cn.iocoder.yudao.module.bpm.service.definition.BpmCategoryService;


import cn.iocoder.yudao.module.bpm.service.definition.BpmProcessDefinitionService;


import cn.iocoder.yudao.module.bpm.service.task.BpmProcessInstanceService;


import cn.iocoder.yudao.module.hrm.controller.admin.approval.vo.HrmTransferApplicationPageReqVO;


import cn.iocoder.yudao.module.hrm.controller.admin.approval.vo.HrmTransferApplicationRespVO;


import cn.iocoder.yudao.module.hrm.controller.admin.approval.vo.HrmTransferApplicationSaveReqVO;


@@ -35,6 +38,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;


@@ -77,6 +81,8 @@


    private StorageAttachmentApi storageAttachmentApi;


    @Resource


    private BpmProcessDefinitionService bpmProcessDefinitionService;


    @Resource


    private BpmProcessInstanceService bpmProcessInstanceService;




    @Override


    @Transactional(rollbackFor = Exception.class)


@@ -269,17 +275,41 @@


            throw exception(TRANSFER_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(TRANSFER_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)));


        transferApplicationMapper.updateById(HrmTransferApplicationDO.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(TRANSFER_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(TRANSFER_APPLICATION_BPM_PROCESS_DEFINITION_NOT_EXISTS));


    }




    private void validateApproveCategoryAndProcessDefinition() {


@@ -302,6 +332,26 @@


    }




    @Override


    @Transactional(rollbackFor = Exception.class)


    public void cancelTransferApplication(Long id, Long userId) {


        HrmTransferApplicationDO application = validateTransferApplicationExists(id);


        if (ObjUtil.notEqual(application.getStatus(), HrmAuditStatusEnum.PROCESS.getStatus())) {


            throw exception(TRANSFER_APPLICATION_CANCEL_FAIL_NOT_PROCESS);


        }


        // 取消对应的 BPM 流程实例（以发起人身份撤销）


        if (StrUtil.isNotBlank(application.getProcessInstanceId())) {


            BpmProcessInstanceCancelReqVO cancelReqVO = new BpmProcessInstanceCancelReqVO();


            cancelReqVO.setId(application.getProcessInstanceId());


            cancelReqVO.setReason("员工撤销调岗申请");


            bpmProcessInstanceService.cancelProcessInstanceByStartUser(userId, cancelReqVO);


        }


        transferApplicationMapper.updateById(HrmTransferApplicationDO.builder()


                .id(id)


                .status(HrmAuditStatusEnum.CANCEL.getStatus())


                .build());


    }




    @Override


    public List<Map<String, Object>> getApproveProcessDefinitionList() {


        validateApproveCategoryAndProcessDefinition();


        List<BpmProcessDefinitionInfoDO> definitionInfoList = bpmProcessDefinitionService