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


@@ -52,6 +52,7 @@


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


import org.flowable.task.service.impl.persistence.entity.TaskEntity;


import org.flowable.variable.api.persistence.entity.VariableInstance;


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


import org.springframework.scheduling.annotation.Async;


import org.springframework.stereotype.Service;


import org.springframework.transaction.annotation.Transactional;


@@ -71,11 +72,16 @@


@Service


public class ActTaskServiceImpl implements IActTaskService {




    private final RuntimeService runtimeService;


    private final TaskService taskService;


    private final HistoryService historyService;


    private final IdentityService identityService;


    private final ManagementService managementService;


    @Autowired(required = false)


    private RuntimeService runtimeService;


    @Autowired(required = false)


    private TaskService taskService;


    @Autowired(required = false)


    private HistoryService historyService;


    @Autowired(required = false)


    private IdentityService identityService;


    @Autowired(required = false)


    private ManagementService managementService;


    private final ActTaskMapper actTaskMapper;


    private final IWfTaskBackNodeService wfTaskBackNodeService;


    private final ActHiTaskinstMapper actHiTaskinstMapper;


@@ -271,6 +277,7 @@


        if (StringUtils.isNotBlank(taskBo.getProcessDefinitionKey())) {


            queryWrapper.eq("t.processDefinitionKey", taskBo.getProcessDefinitionKey());


        }


        queryWrapper.orderByDesc("t.CREATE_TIME_");


        Page<TaskVo> page = actTaskMapper.getTaskWaitByPage(pageQuery.build(), queryWrapper);




        List<TaskVo> taskList = page.getRecords();


@@ -360,6 +367,7 @@


        queryWrapper.like(StringUtils.isNotBlank(taskBo.getProcessDefinitionName()), "t.processDefinitionName", taskBo.getProcessDefinitionName());


        queryWrapper.eq(StringUtils.isNotBlank(taskBo.getProcessDefinitionKey()), "t.processDefinitionKey", taskBo.getProcessDefinitionKey());


        queryWrapper.eq("t.assignee_", userId);


        queryWrapper.orderByDesc("t.START_TIME_");


        Page<TaskVo> page = actTaskMapper.getTaskFinishByPage(pageQuery.build(), queryWrapper);




        List<TaskVo> taskList = page.getRecords();


@@ -396,6 +404,7 @@


            queryWrapper.eq("t.processDefinitionKey", taskBo.getProcessDefinitionKey());


        }


        queryWrapper.eq("t.assignee_", userId);


        queryWrapper.orderByDesc("t.START_TIME_");


        Page<TaskVo> page = actTaskMapper.getTaskCopyByPage(pageQuery.build(), queryWrapper);




        List<TaskVo> taskList = page.getRecords();