yangys
2025-06-17 ceb4fde6edb1f73bc45f54129432ec8068875b6d
blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/FlowBusinessService.java
@@ -9,12 +9,15 @@
import org.flowable.task.api.Task;
import org.flowable.task.api.TaskQuery;
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.*;
import org.springblade.mdm.basesetting.machine.MachineService;
import org.springblade.mdm.flow.entity.MdmFlowProcess;
import org.springblade.mdm.flow.util.MdmFlowCache;
import org.springblade.mdm.flow.vo.FlowVO;
import org.springblade.system.feign.IUserClient;
import org.springblade.system.pojo.entity.User;
import org.springframework.stereotype.Service;
import java.time.LocalDate;
@@ -33,7 +36,7 @@
   private final TaskService taskService;
   private final HistoryService historyService;
   private final MachineService machineService;
   private final IUserClient userClient;
   public IPage<FlowVO> selectTodoPage(IPage<FlowVO> page, LocalDate createTimeBegin, LocalDate createTimeEnd, String keyword) {
      //String taskUser = TaskUtil.getTaskUser();
@@ -263,12 +266,20 @@
         flow.setProcessDefinitionId(task.getProcessDefinitionId());
         //flow.setProcessDefinitionKey(processDefinition.getKey());
         //flow.setProcessDefinitionVersion(processDefinition.getVersion());
         flow.setProcessInstanceId(task.getProcessInstanceId());
         // 查询流程实例创建时间
         HistoricProcessInstance historicProcess = historyService.createHistoricProcessInstanceQuery()
            .processInstanceId(task.getProcessInstanceId())
            .singleResult();
         flow.setProcessCreateTime(historicProcess.getStartTime());
         R<User> ru = userClient.userInfoById(Long.valueOf(historicProcess.getStartUserId()));
         if(ru.isSuccess()) {
            flow.setStartUserName(ru.getData().getName());
         }
         MdmFlowProcess processDefinition = MdmFlowCache.getProcessDefinition(task.getProcessDefinitionId());
         flow.setCategory(processDefinition.getCategory());