兰宝车间质量管理系统
blame | 历史 | 补丁 | 提交 | 提交对比 | 忽略空白
疯狂的狮子Li
2024-08-26 098d3347a0df808908aab8c554cd7c4febc5e6d9 
 ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/ActProcessInstanceServiceImpl.java


@@ -9,6 +9,7 @@


import lombok.RequiredArgsConstructor;


import lombok.SneakyThrows;


import lombok.extern.slf4j.Slf4j;


import org.dromara.common.core.enums.BusinessStatusEnum;


import org.dromara.common.core.exception.ServiceException;


import org.dromara.common.core.service.UserService;


import org.dromara.common.core.utils.StreamUtils;


@@ -17,7 +18,6 @@


import org.dromara.common.mybatis.core.page.TableDataInfo;


import org.dromara.common.satoken.utils.LoginHelper;


import org.dromara.workflow.common.constant.FlowConstant;


import org.dromara.common.core.enums.BusinessStatusEnum;


import org.dromara.workflow.common.enums.TaskStatusEnum;


import org.dromara.workflow.domain.ActHiProcinst;


import org.dromara.workflow.domain.bo.ProcessInstanceBo;


@@ -34,7 +34,7 @@


import org.dromara.workflow.service.IWfTaskBackNodeService;


import org.dromara.workflow.utils.QueryUtils;


import org.dromara.workflow.utils.WorkflowUtils;


import org.flowable.bpmn.model.*;


import org.flowable.bpmn.model.BpmnModel;


import org.flowable.engine.*;


import org.flowable.engine.history.HistoricActivityInstance;


import org.flowable.engine.history.HistoricProcessInstance;


@@ -48,6 +48,7 @@


import org.flowable.task.api.Task;


import org.flowable.task.api.history.HistoricTaskInstance;


import org.springframework.beans.BeanUtils;


import org.springframework.beans.factory.annotation.Autowired;


import org.springframework.beans.factory.annotation.Value;


import org.springframework.stereotype.Service;


import org.springframework.transaction.annotation.Transactional;


@@ -57,7 +58,6 @@


import java.nio.charset.StandardCharsets;


import java.util.List;


import java.util.*;


import java.util.stream.Collectors;




/**


 * 流程实例 服务层实现


@@ -69,12 +69,17 @@


@Service


public class ActProcessInstanceServiceImpl implements IActProcessInstanceService {




    private final RepositoryService repositoryService;


    private final RuntimeService runtimeService;


    private final HistoryService historyService;


    private final TaskService taskService;


    @Autowired(required = false)


    private RepositoryService repositoryService;


    @Autowired(required = false)


    private RuntimeService runtimeService;


    @Autowired(required = false)


    private HistoryService historyService;


    @Autowired(required = false)


    private TaskService taskService;


    @Autowired(required = false)


    private ManagementService managementService;


    private final IActHiProcinstService actHiProcinstService;


    private final ManagementService managementService;


    private final IWfTaskBackNodeService wfTaskBackNodeService;


    private final IWfNodeConfigService wfNodeConfigService;


    private final FlowProcessEventHandler flowProcessEventHandler;


@@ -257,15 +262,15 @@


        List<HistoricActivityInstance> highLightedFlowList = QueryUtils.hisActivityInstanceQuery(processInstanceId).orderByHistoricActivityInstanceStartTime().asc().list();


        for (HistoricActivityInstance tempActivity : highLightedFlowList) {


            Map<String, Object> task = new HashMap<>();


            if (!FlowConstant.SEQUENCE_FLOW.equals(tempActivity.getActivityType()) &&


                !FlowConstant.PARALLEL_GATEWAY.equals(tempActivity.getActivityType()) &&


                !FlowConstant.EXCLUSIVE_GATEWAY.equals(tempActivity.getActivityType()) &&


                !FlowConstant.INCLUSIVE_GATEWAY.equals(tempActivity.getActivityType())


            ) {


                task.put("key", tempActivity.getActivityId());


                task.put("completed", tempActivity.getEndTime() != null);


                task.put("activityType", tempActivity.getActivityType());


                taskList.add(task);


            switch (tempActivity.getActivityType()) {


                case FlowConstant.SEQUENCE_FLOW, FlowConstant.PARALLEL_GATEWAY,


                     FlowConstant.EXCLUSIVE_GATEWAY, FlowConstant.INCLUSIVE_GATEWAY -> {}


                default -> {


                    task.put("key", tempActivity.getActivityId());


                    task.put("completed", tempActivity.getEndTime() != null);


                    task.put("activityType", tempActivity.getActivityType());


                    taskList.add(task);


                }


            }


        }


        ProcessInstance processInstance = QueryUtils.instanceQuery(processInstanceId).singleResult();