自动创建节点

yangys

2025-08-02 b854c5cde81a88e8dea0b5df03219a2fcfef6ac6

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

@@ -17,10 +17,13 @@
import org.springblade.core.tool.utils.*;

import org.springblade.mdm.basesetting.machine.MachineService;
import org.springblade.mdm.flow.constants.FlowContants;
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.NcProgram;
import org.springblade.mdm.program.entity.ProcessProgRef;
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;
@@ -48,7 +51,7 @@
   private final IUserClient userClient;
   private final ProcessProgRefService processProgRefService;
   private final ApproveRecordService approveRecordService;

   private final NcProgramService ncProgramService;
   /**
    * 查询我的流程(个人待办列表)
    * @param page 分页信息
@@ -274,7 +277,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,6 +293,7 @@

         flow.setProcessDefinitionId(task.getProcessDefinitionId());

         flow.setFile(getNcFileString(String.valueOf(task.getProcessVariables().get("programIds"))));
         //flow.setProcessDefinitionKey(processDefinition.getKey());
         //flow.setProcessDefinitionVersion(processDefinition.getVersion());
         flow.setProcessInstanceId(task.getProcessInstanceId());
@@ -474,10 +478,10 @@

   /**
    * 已完结的流程分页列表
    * @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) {
@@ -495,7 +499,7 @@
      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 +515,7 @@
         vo.setProcessCreateTime(processInstance.getStartTime());
         vo.setHistoryTaskEndTime(processInstance.getEndTime());

         vo.setFile(getNcFileString(String.valueOf(processInstance.getProcessVariables().get(FlowContants.PROGRAM_IDS_KEY))));
         records.add(vo);
      }

@@ -518,4 +523,13 @@

      return page;
   }

   String getNcFileString(String programIds){
      String result = "";
      if(Func.isNotEmpty(programIds)) {
         List<NcProgram> progList= ncProgramService.listByIds(Func.toLongList(programIds));
         result = String.join(",",progList.stream().map(NcProgram::getName).toList());
      }
      return result;
   }
}