yangys
2025-09-13 a0f3e98fdd9472af3c78b42423a7e3fa6fb92eba
blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/FlowBusinessService.java
@@ -23,8 +23,6 @@
import org.springblade.mdm.flow.entity.MdmFlowProcess;
import org.springblade.mdm.flow.util.MdmFlowCache;
import org.springblade.mdm.flow.vo.FlowVO;
import org.springblade.mdm.program.service.NcProgramService;
import org.springblade.mdm.program.service.ProcessProgRefService;
import org.springblade.system.feign.IUserClient;
import org.springblade.system.pojo.entity.User;
import org.springframework.stereotype.Service;
@@ -36,7 +34,7 @@
/**
 * 流程业务实现类
 *
 * @author Chill
 * @author yangys
 */
@Service
@AllArgsConstructor
@@ -156,7 +154,6 @@
         if(ru.isSuccess()) {
            flow.setStartUserName(ru.getData().getName());
         }
         ;
         List<Comment> comments = lastStepComments(task);//taskService.getTaskComments(task.getId());
         if(!comments.isEmpty()){
            flow.setComment(comments.get(0).getFullMessage());
@@ -203,15 +200,7 @@
         return Collections.emptyList();
      }
   }
   /**
    * 获取历史流程
    *
    * @param processInstanceId 流程实例id
    * @return HistoricProcessInstance
    */
   private HistoricProcessInstance getHistoricProcessInstance(String processInstanceId) {
      return historyService.createHistoricProcessInstanceQuery().processInstanceId(processInstanceId).singleResult();
   }
   public IPage<FlowVO> selectAllTaskPage(IPage<FlowVO> page, String keyword) {
@@ -377,6 +366,11 @@
         vo.setProcessCreateTime(processInstance.getStartTime());
         vo.setHistoryTaskEndTime(processInstance.getEndTime());
         R<User> ru = userClient.userInfoById(Long.valueOf(processInstance.getStartUserId()));
         if(ru.isSuccess()) {
            vo.setStartUserName(ru.getData().getName());
         }
         vo.setFile(getFileString(processInstance.getId()));
         records.add(vo);
      }
@@ -398,6 +392,8 @@
   public IPage<FlowVO> selectExceptionPage(IPage<FlowVO> page, String myProcessName, String keyword,LocalDateTime createTimeBegin, LocalDateTime createTimeEnd) {
      HistoricProcessInstanceQuery query = this.historyService.createHistoricProcessInstanceQuery().finished().includeProcessVariables();
      //.finished() // 只查询已完成的流程.unfinished() // 查询未完成的流程
      query.variableValueEquals(FlowContants.EXCEPTION, "1");
      if(Func.isNotEmpty(myProcessName)) {
         query.variableValueEquals(FlowContants.MY_PROCESS_NAME, myProcessName);
      }
@@ -440,7 +436,10 @@
         vo.setProcessCreateTime(processInstance.getStartTime());
         vo.setHistoryTaskEndTime(processInstance.getEndTime());
         R<User> ru = userClient.userInfoById(Long.valueOf(processInstance.getStartUserId()));
         if(ru.isSuccess()) {
            vo.setStartUserName(ru.getData().getName());
         }
         vo.setFile(getFileString(processInstance.getId()));
         records.add(vo);
      }
@@ -548,4 +547,5 @@
      return page;
   }
}