修改constant类名

yangys

2025-09-18 0d61b9bfca526e9c3da2209de8f9f367e76fd013

 blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/FlowBusinessService.java

@@ -10,34 +10,35 @@
import org.flowable.engine.history.HistoricProcessInstanceQuery;
import org.flowable.engine.task.Comment;
import org.flowable.task.api.Task;
import org.flowable.task.api.TaskInfoQuery;
import org.flowable.task.api.TaskQuery;
import org.flowable.task.api.history.HistoricTaskInstance;
import org.flowable.task.api.history.HistoricTaskInstanceQuery;
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.basesetting.machine.entity.Machine;
import org.springblade.mdm.basesetting.machine.service.MachineService;
import org.springblade.mdm.commons.service.ParamService;
import org.springblade.mdm.flow.constants.FlowVariableConstant;
import org.springblade.mdm.flow.entity.FlowProgramFile;
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.entity.ProcessProgRef;
import org.springblade.mdm.program.service.ProcessProgRefService;
import org.springblade.mdm.flow.vo.TodoQueryVO;
import org.springblade.system.feign.IUserClient;
import org.springblade.system.pojo.entity.User;
import org.springframework.stereotype.Service;

import java.time.LocalDate;
import java.time.LocalDateTime;
import java.util.Collections;
import java.util.Date;
import java.util.LinkedList;
import java.util.List;
import java.util.stream.Collectors;
import java.util.*;

/**
 * 流程业务实现类
 *
 * @author Chill
 * @author yangys
 */
@Service
@AllArgsConstructor
@@ -46,9 +47,9 @@
   private final TaskService taskService;
   private final HistoryService historyService;
   private final IUserClient userClient;
   private final ProcessProgRefService processProgRefService;
   private final ApproveRecordService approveRecordService;

   private final FlowProgramFileService flowProgramFileService;
   private final ParamService paramService;
   private final MachineService machineService;
   /**
    * 查询我的流程(个人待办列表)
    * @param page 分页信息
@@ -57,24 +58,47 @@
    * @param keyword 查询关键字
    * @return
    */
   public IPage<FlowVO> selectTodoPage(IPage<FlowVO> page, LocalDateTime createTimeBegin, LocalDateTime createTimeEnd, String keyword) {
   public IPage<FlowVO> selectTodoPage(IPage<FlowVO> page, TodoQueryVO queryVO) {//LocalDateTime createTimeBegin, LocalDateTime createTimeEnd, String keyword
      //String taskUser = TaskUtil.getTaskUser();
      String userId = "" + AuthUtil.getUserId();
      List<FlowVO> flowList = new LinkedList<>();

      TaskQuery todoQuery = taskService.createTaskQuery().taskAssignee(userId).active().includeProcessVariables();
      if (Func.isNotEmpty(createTimeBegin)) {
         todoQuery.taskCreatedAfter(DateUtil.toDate(createTimeBegin));

         ////如果查询实例的开始时间：只能用以下这个，先查出实例id来
         //todoQuery.processInstanceIdIn()
      if(queryVO.getMachineSpec() != null){
         if(queryVO.getMachineSpec().length==1) {//2个为全选
            //查询车床代码集合
            String turnVal = paramService.turninngValue();
            List<Machine> machines = machineService.lambdaQuery().eq(Machine::getMachineSpec, turnVal).eq(Machine::getStatus, Machine.STATUS_ENABLE).list();
            List<String> turnMachineCodes = machines.stream().map(Machine::getCode).toList();

            List<String> specs = Arrays.asList(queryVO.getMachineSpec());
            if (specs.contains("1")) {
               //车床
               todoQuery.or();
               for (String mCode : turnMachineCodes) {
                  todoQuery.processVariableValueEquals(FlowVariableConstant.MACHINE_CODE, mCode);
               }
               todoQuery.endOr();
            } else {
               //加工中心
               todoQuery.or();
               for (String mCode : turnMachineCodes) {
                  todoQuery.processVariableValueNotEquals(FlowVariableConstant.MACHINE_CODE, mCode);
               }
               todoQuery.endOr();
            }
         }
      }
      if (Func.isNotEmpty(createTimeEnd)) {
         todoQuery.taskCreatedBefore(DateUtil.toDate(createTimeEnd));
         //todoQuery.taskInProgressStartTimeBefore(DateUtil.toDate(createTimeEnd));

      if (Func.isNotEmpty(queryVO.getCreateTimeBegin())) {
         todoQuery.taskCreatedAfter(DateUtil.toDate(queryVO.getCreateTimeBegin()));
      }
      if (Func.isNotEmpty(keyword)) {
         addKeywordCondition(todoQuery, keyword);
      if (Func.isNotEmpty(queryVO.getCreateTimeEnd())) {
         todoQuery.taskCreatedBefore(DateUtil.toDate(queryVO.getCreateTimeEnd()));
      }
      if (Func.isNotEmpty(queryVO.getKeyword())) {
         addKeywordCondition(todoQuery, queryVO.getKeyword());
      }

      todoQuery.orderByTaskCreateTime().desc();
@@ -82,11 +106,7 @@
      // 构建列表数据
      FlowVO bladeFlow = new FlowVO();
      buildFlowTaskList(bladeFlow, flowList, todoQuery,page.getCurrent(),page.getSize());
      flowList.forEach(flowVO -> {
         if(flowVO.getVariables().containsKey("machineCode")){
            //Machine machinemachineService.getByCode((String)flowVO.getVariables().get("machineCode"))
         }
      });

      // 计算总数
      long count = todoQuery.count();

@@ -96,161 +116,24 @@
      page.setRecords(flowList);
      return page;
   }

   void addKeywordCondition(TaskQuery todoQuery,String keyword) {
   //TaskInfoQuery
   //void addKeywordCondition(TaskQuery todoQuery,String keyword) {
   void addKeywordCondition(TaskInfoQuery todoQuery, String keyword) {
      if(Func.isNotEmpty(keyword)) {
         String likeVal = "%" + keyword + "%";
         todoQuery.or();
         todoQuery.processVariableValueLike(FlowVariableConstant.TITLE,likeVal);
         todoQuery.processVariableValueLike(FlowVariableConstant.PROCESS_NO, likeVal);
         todoQuery.processVariableValueLike(FlowVariableConstant.MACHINE_CODE, likeVal);
         todoQuery.processVariableValueLike(FlowVariableConstant.MACHINE_MODE, likeVal);
         todoQuery.processVariableValueLike(FlowVariableConstant.PROCESS_NAME, likeVal);
         todoQuery.processVariableValueLike(FlowVariableConstant.PROCESS_EDITION, likeVal);
         todoQuery.processVariableValueLike(FlowVariableConstant.CRAFT_EDITION, likeVal);

         todoQuery.processVariableValueLike("processNo", "%" + keyword + "%");
         todoQuery.processVariableValueLike("machineCode", "%" + keyword + "%");
         todoQuery.processVariableValueLike("machineMode", "%" + keyword + "%");
         todoQuery.processVariableValueLike("processName", "%" + keyword + "%");
         todoQuery.processVariableValueLike("processEdition", "%" + keyword + "%");
         todoQuery.processVariableValueLike("craftEdition", "%" + keyword + "%");

         todoQuery.processDefinitionNameLike(likeVal);
         todoQuery.endOr();
      }
   }
   /*
   @Override
   public IPage<BladeFlow> selectSendPage(IPage<BladeFlow> page, BladeFlow bladeFlow) {
      String taskUser = TaskUtil.getTaskUser();
      List<BladeFlow> flowList = new LinkedList<>();

      HistoricProcessInstanceQuery historyQuery = historyService.createHistoricProcessInstanceQuery().startedBy(taskUser).orderByProcessInstanceStartTime().desc();

      if (bladeFlow.getCategory() != null) {
         historyQuery.processDefinitionCategory(bladeFlow.getCategory());
      }
      if (bladeFlow.getProcessDefinitionName() != null) {
         historyQuery.processDefinitionName(bladeFlow.getProcessDefinitionName());
      }
      if (bladeFlow.getBeginDate() != null) {
         historyQuery.startedAfter(bladeFlow.getBeginDate());
      }
      if (bladeFlow.getEndDate() != null) {
         historyQuery.startedBefore(bladeFlow.getEndDate());
      }

      // 查询列表
      List<HistoricProcessInstance> historyList = historyQuery.listPage(Func.toInt((page.getCurrent() - 1) * page.getSize()), Func.toInt(page.getSize()));

      historyList.forEach(historicProcessInstance -> {
         BladeFlow flow = new BladeFlow();
         // historicProcessInstance
         flow.setCreateTime(historicProcessInstance.getStartTime());
         flow.setEndTime(historicProcessInstance.getEndTime());
         flow.setVariables(historicProcessInstance.getProcessVariables());
         String[] businessKey = Func.toStrArray(StringPool.COLON, historicProcessInstance.getBusinessKey());
         if (businessKey.length > 1) {
            flow.setBusinessTable(businessKey[0]);
            flow.setBusinessId(businessKey[1]);
         }
         flow.setHistoryActivityName(historicProcessInstance.getName());
         flow.setProcessInstanceId(historicProcessInstance.getId());
         flow.setHistoryProcessInstanceId(historicProcessInstance.getId());
         // ProcessDefinition
         FlowProcess processDefinition = FlowCache.getProcessDefinition(historicProcessInstance.getProcessDefinitionId());
         flow.setProcessDefinitionId(processDefinition.getId());
         flow.setProcessDefinitionName(processDefinition.getName());
         flow.setProcessDefinitionVersion(processDefinition.getVersion());
         flow.setProcessDefinitionKey(processDefinition.getKey());
         flow.setCategory(processDefinition.getCategory());
         flow.setCategoryName(FlowCache.getCategoryName(processDefinition.getCategory()));
         flow.setProcessInstanceId(historicProcessInstance.getId());
         // HistoricTaskInstance
         List<HistoricTaskInstance> historyTasks = historyService.createHistoricTaskInstanceQuery().processInstanceId(historicProcessInstance.getId()).orderByHistoricTaskInstanceEndTime().desc().list();
         if (Func.isNotEmpty(historyTasks)) {
            HistoricTaskInstance historyTask = historyTasks.iterator().next();
            flow.setTaskId(historyTask.getId());
            flow.setTaskName(historyTask.getName());
            flow.setTaskDefinitionKey(historyTask.getTaskDefinitionKey());
         }
         // Status
         if (historicProcessInstance.getEndActivityId() != null) {
            flow.setProcessIsFinished(FlowEngineConstant.STATUS_FINISHED);
         } else {
            flow.setProcessIsFinished(FlowEngineConstant.STATUS_UNFINISHED);
         }
         flow.setStatus(FlowEngineConstant.STATUS_FINISH);
         flowList.add(flow);
      });

      // 计算总数
      long count = historyQuery.count();
      // 设置总数
      page.setTotal(count);
      page.setRecords(flowList);
      return page;
   }

   @Override
   public IPage<BladeFlow> selectDonePage(IPage<BladeFlow> page, BladeFlow bladeFlow) {
      String taskUser = TaskUtil.getTaskUser();
      List<BladeFlow> flowList = new LinkedList<>();

      HistoricTaskInstanceQuery doneQuery = historyService.createHistoricTaskInstanceQuery().taskAssignee(taskUser).finished()
         .includeProcessVariables().orderByHistoricTaskInstanceEndTime().desc();

      if (bladeFlow.getCategory() != null) {
         doneQuery.processCategoryIn(Func.toStrList(bladeFlow.getCategory()));
      }
      if (bladeFlow.getProcessDefinitionName() != null) {
         doneQuery.processDefinitionName(bladeFlow.getProcessDefinitionName());
      }
      if (bladeFlow.getBeginDate() != null) {
         doneQuery.taskCompletedAfter(bladeFlow.getBeginDate());
      }
      if (bladeFlow.getEndDate() != null) {
         doneQuery.taskCompletedBefore(bladeFlow.getEndDate());
      }

      // 查询列表
      List<HistoricTaskInstance> doneList = doneQuery.listPage(Func.toInt((page.getCurrent() - 1) * page.getSize()), Func.toInt(page.getSize()));
      doneList.forEach(historicTaskInstance -> {
         BladeFlow flow = new BladeFlow();
         flow.setTaskId(historicTaskInstance.getId());
         flow.setTaskDefinitionKey(historicTaskInstance.getTaskDefinitionKey());
         flow.setTaskName(historicTaskInstance.getName());
         flow.setAssignee(historicTaskInstance.getAssignee());
         flow.setCreateTime(historicTaskInstance.getCreateTime());
         flow.setExecutionId(historicTaskInstance.getExecutionId());
         flow.setHistoryTaskEndTime(historicTaskInstance.getEndTime());
         flow.setVariables(historicTaskInstance.getProcessVariables());

         FlowProcess processDefinition = FlowCache.getProcessDefinition(historicTaskInstance.getProcessDefinitionId());
         flow.setProcessDefinitionId(processDefinition.getId());
         flow.setProcessDefinitionName(processDefinition.getName());
         flow.setProcessDefinitionKey(processDefinition.getKey());
         flow.setProcessDefinitionVersion(processDefinition.getVersion());
         flow.setCategory(processDefinition.getCategory());
         flow.setCategoryName(FlowCache.getCategoryName(processDefinition.getCategory()));

         flow.setProcessInstanceId(historicTaskInstance.getProcessInstanceId());
         flow.setHistoryProcessInstanceId(historicTaskInstance.getProcessInstanceId());
         HistoricProcessInstance historicProcessInstance = getHistoricProcessInstance((historicTaskInstance.getProcessInstanceId()));
         if (Func.isNotEmpty(historicProcessInstance)) {
            String[] businessKey = Func.toStrArray(StringPool.COLON, historicProcessInstance.getBusinessKey());
            flow.setBusinessTable(businessKey[0]);
            flow.setBusinessId(businessKey[1]);
            if (historicProcessInstance.getEndActivityId() != null) {
               flow.setProcessIsFinished(FlowEngineConstant.STATUS_FINISHED);
            } else {
               flow.setProcessIsFinished(FlowEngineConstant.STATUS_UNFINISHED);
            }
         }
         flow.setStatus(FlowEngineConstant.STATUS_FINISH);
         flowList.add(flow);
      });
      // 计算总数
      long count = doneQuery.count();
      // 设置总数
      page.setTotal(count);
      page.setRecords(flowList);
      return page;
   }

   */
   /**
    * 构建流程
    *
@@ -274,7 +157,7 @@

      //List<Task> tasks = taskQuery.list();
      long total = taskQuery.count();
      Long firstResult = (currentPage-1)*pageSize+1;
      Long firstResult = (currentPage-1)*pageSize;
      List<Task> tasks = taskQuery.listPage(Func.toInt(firstResult), Func.toInt(pageSize));
      tasks.forEach(task -> {
         FlowVO flow = new FlowVO();
@@ -290,8 +173,7 @@

         flow.setProcessDefinitionId(task.getProcessDefinitionId());

         //flow.setProcessDefinitionKey(processDefinition.getKey());
         //flow.setProcessDefinitionVersion(processDefinition.getVersion());
         flow.setFile(getFileString(task.getProcessInstanceId()));
         flow.setProcessInstanceId(task.getProcessInstanceId());

         // 查询流程实例创建时间
@@ -304,7 +186,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());
@@ -351,15 +232,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) {

@@ -435,10 +308,9 @@
    * @param keyword
    * @return
    */
   public IPage<FlowVO> selectSearchPage(IPage<FlowVO> page, LocalDate createTimeBegin, LocalDate createTimeEnd,String processDefinitionKey,String keyword) {
   public IPage<FlowVO> selectSearchPage(IPage<FlowVO> page,String myProcessName,String keyword, LocalDate createTimeBegin, LocalDate createTimeEnd) {

      List<FlowVO> flowList = new LinkedList<>();
      Date now = new Date();
      TaskQuery taskQuery = taskService.createTaskQuery().active().includeProcessVariables();
      if(Func.isNotEmpty(createTimeBegin)) {
         taskQuery.taskCreatedAfter(DateUtil.toDate(createTimeBegin));
@@ -446,8 +318,8 @@
      if(Func.isNotEmpty(createTimeEnd)) {
         taskQuery.taskCreatedBefore(DateUtil.toDate(createTimeEnd.plusDays(1)));
      }
      if(Func.isNotEmpty(processDefinitionKey)) {
         taskQuery.processDefinitionKey(processDefinitionKey);
      if(Func.isNotEmpty(myProcessName)) {
         taskQuery.processVariableValueEquals(FlowVariableConstant.MY_PROCESS_NAME, myProcessName);
      }

      addKeywordCondition(taskQuery, keyword);
@@ -474,17 +346,17 @@

   /**
    * 已完结的流程分页列表
    * @param page
    * @param page 分页信息
    * @param createTimeBegin
    * @param createTimeEnd
    * @param keyword
    * @param keyword 关键字
    * @return
    */
   public IPage<FlowVO> selectFinishedPage(IPage<FlowVO> page, String processDefinitionKey,LocalDate createTimeBegin, LocalDate createTimeEnd, String keyword) {
      HistoricProcessInstanceQuery query = this.historyService.createHistoricProcessInstanceQuery().includeProcessVariables();
   public IPage<FlowVO> selectFinishedPage(IPage<FlowVO> page, String myProcessName, String keyword,LocalDateTime createTimeBegin, LocalDateTime createTimeEnd) {
      HistoricProcessInstanceQuery query = this.historyService.createHistoricProcessInstanceQuery().finished().includeProcessVariables();
         //.finished() // 只查询已完成的流程.unfinished() // 查询未完成的流程
      if(Func.isNotEmpty(processDefinitionKey)) {
         query.processDefinitionKey(processDefinitionKey);
      if(Func.isNotEmpty(myProcessName)) {
         query.variableValueEquals(FlowVariableConstant.MY_PROCESS_NAME, myProcessName);
      }
      if(createTimeBegin!=null) {
         query.startedAfter(DateUtil.toDate(createTimeBegin));
@@ -492,10 +364,25 @@
      if(createTimeEnd!=null) {
         query.startedBefore(DateUtil.toDate(createTimeEnd));
      }
      if(Func.isNotEmpty(keyword)) {
         String likeVal = "%" + keyword + "%";
         query.or();
         query.variableValueLike(FlowVariableConstant.TITLE,likeVal);
         query.variableValueLike(FlowVariableConstant.PROCESS_NO, likeVal);
         query.variableValueLike(FlowVariableConstant.MACHINE_CODE, likeVal);
         query.variableValueLike(FlowVariableConstant.MACHINE_MODE, likeVal);
         query.variableValueLike(FlowVariableConstant.PROCESS_NAME, likeVal);
         query.variableValueLike(FlowVariableConstant.PROCESS_EDITION, likeVal);
         query.variableValueLike(FlowVariableConstant.CRAFT_EDITION, likeVal);

         query.endOr();
      }


      query.orderByProcessInstanceEndTime().desc(); // 按结束时间降序排列
      page.setTotal(query.count());

      long firstResult = (page.getCurrent()-1) * page.getSize() + 1;
      long firstResult = (page.getCurrent()-1) * page.getSize();
      List<HistoricProcessInstance> processes = query
         .listPage((int)firstResult, (int)page.getSize());

@@ -511,6 +398,12 @@
         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);
      }

@@ -518,4 +411,173 @@

      return page;
   }

   /**
    * 异常流程
    * @param page
    * @param myProcessName
    * @param keyword
    * @param createTimeBegin
    * @param createTimeEnd
    * @return
    */
   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(FlowVariableConstant.EXCEPTION, "1");
      if(Func.isNotEmpty(myProcessName)) {
         query.variableValueEquals(FlowVariableConstant.MY_PROCESS_NAME, myProcessName);
      }
      if(createTimeBegin!=null) {
         query.startedAfter(DateUtil.toDate(createTimeBegin));
      }
      if(createTimeEnd!=null) {
         query.startedBefore(DateUtil.toDate(createTimeEnd));
      }
      if(Func.isNotEmpty(keyword)) {
         String likeVal = "%" + keyword + "%";
         query.or();
         query.variableValueLike(FlowVariableConstant.TITLE,likeVal);
         query.variableValueLike(FlowVariableConstant.PROCESS_NO, likeVal);
         query.variableValueLike(FlowVariableConstant.MACHINE_CODE, likeVal);
         query.variableValueLike(FlowVariableConstant.MACHINE_MODE, likeVal);
         query.variableValueLike(FlowVariableConstant.PROCESS_NAME, likeVal);
         query.variableValueLike(FlowVariableConstant.PROCESS_EDITION, likeVal);
         query.variableValueLike(FlowVariableConstant.CRAFT_EDITION, likeVal);

         query.endOr();
      }


      query.orderByProcessInstanceEndTime().desc(); // 按结束时间降序排列
      page.setTotal(query.count());

      long firstResult = (page.getCurrent()-1) * page.getSize();
      List<HistoricProcessInstance> processes = query
         .listPage((int)firstResult, (int)page.getSize());

      List<FlowVO> records = new LinkedList<>();

      for(HistoricProcessInstance processInstance : processes) {
         FlowVO vo = new FlowVO();
         vo.setProcessDefinitionKey(processInstance.getProcessDefinitionKey());
         vo.setProcessInstanceId(processInstance.getId());
         vo.setProcessDefinitionName(processInstance.getProcessDefinitionName());
         vo.setVariables(processInstance.getProcessVariables());

         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);
      }

      page.setRecords(records);

      return page;
   }
   /*
   获取列表中的文件名
    */
   String getFileString(String processInstanceId){
      String result = "";
      List<FlowProgramFile> fileList = flowProgramFileService.lambdaQuery().eq(FlowProgramFile::getProcessInstanceId, processInstanceId).list();

      result = String.join(",",fileList.stream().map(FlowProgramFile::getName).toList());

      return result;
   }

   /**
    * 个人已办(已完成任务)
    * @param page
    * @param processDefinitionKey
    * @param createTimeBegin
    * @param createTimeEnd
    * @param keyword
    * @return
    */
   public IPage<FlowVO> selectDonePage(IPage<FlowVO> page, String processDefinitionKey,LocalDateTime createTimeBegin, LocalDateTime createTimeEnd, String keyword) {
      String userId = "" + AuthUtil.getUserId();
      HistoricTaskInstanceQuery doneTaskQuery = historyService.createHistoricTaskInstanceQuery().taskAssignee(userId).finished().includeProcessVariables();

      //.finished() // 只查询已完成的流程.unfinished() // 查询未完成的流程
      if(Func.isNotEmpty(processDefinitionKey)) {
         doneTaskQuery.processDefinitionKey(processDefinitionKey);
      }
      if(createTimeBegin!=null) {
         Date after = DateUtil.toDate(createTimeBegin);

         doneTaskQuery.taskCreatedAfter(after);

         //doneTaskQuery.taskCreatedOn(after);
         //doneTaskQuery.taskInProgressStartTimeAfter(after);
      }
      if(createTimeEnd!=null) {
         Date before = DateUtil.toDate(createTimeEnd);

         doneTaskQuery.taskCreatedBefore(before);

         //doneTaskQuery.taskInProgressStartTimeBefore(before);
      }

      if (Func.isNotEmpty(keyword)) {
         addKeywordCondition(doneTaskQuery, keyword);
      }

      doneTaskQuery.orderByTaskCreateTime().desc(); // 按结束时间降序排列
      page.setTotal(doneTaskQuery.count());

      long firstResult = (page.getCurrent()-1) * page.getSize();

      List<HistoricTaskInstance> processes = doneTaskQuery
         .listPage((int)firstResult, (int)page.getSize());

      List<FlowVO> records = new LinkedList<>();

      Map<String,String> startUserMap = new HashMap<>();//使用userId缓存其姓名
      for(HistoricTaskInstance hisTask : processes) {
         FlowVO vo = new FlowVO();

         HistoricProcessInstance processInstance = historyService
            .createHistoricProcessInstanceQuery()
            .processInstanceId(hisTask.getProcessInstanceId())
            .singleResult();

         if(startUserMap.containsKey(processInstance.getStartUserId())) {
            vo.setStartUserName(startUserMap.get(processInstance.getStartUserId()));
         }else {
            R<User> ru = userClient.userInfoById(Long.valueOf(processInstance.getStartUserId()));
            if (ru.isSuccess()) {
               vo.setStartUserName(ru.getData().getName());
               startUserMap.put(processInstance.getStartUserId(),ru.getData().getName());
            }
         }
         vo.setProcessCreateTime(processInstance.getStartTime());

         vo.setProcessInstanceId(hisTask.getProcessInstanceId());
         vo.setProcessDefinitionName(processInstance.getProcessDefinitionName());
         vo.setProcessDefinitionKey(processInstance.getProcessDefinitionKey());
         vo.setTaskName(hisTask.getName());
         vo.setTaskDefinitionKey(hisTask.getTaskDefinitionKey());
         vo.setCreateTime(hisTask.getCreateTime());
         vo.setEndTime(hisTask.getEndTime());
         vo.setVariables(hisTask.getProcessVariables());

         vo.setProcessCreateTime(processInstance.getStartTime());
         vo.setHistoryTaskEndTime(hisTask.getEndTime());

         vo.setFile(getFileString(hisTask.getProcessInstanceId()));
         records.add(vo);
      }

      page.setRecords(records);

      return page;
   }

}