清除无用的显示ncprogram的内容代码

yangys

2025-08-05 4f91b953e8f0ae7c63aea01a57367b6b57639a7f

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

@@ -16,11 +16,11 @@
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.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.NcProgramService;
import org.springblade.mdm.program.service.ProcessProgRefService;
import org.springblade.system.feign.IUserClient;
import org.springblade.system.pojo.entity.User;
@@ -32,7 +32,6 @@
import java.util.Date;
import java.util.LinkedList;
import java.util.List;
import java.util.stream.Collectors;

/**
 * 流程业务实现类
@@ -48,13 +47,14 @@
   private final IUserClient userClient;
   private final ProcessProgRefService processProgRefService;
   private final ApproveRecordService approveRecordService;

   private final NcProgramService ncProgramService;
   private final FlowProgramFileService flowProgramFileService;
   /**
    * 查询我的流程(个人待办列表)
    * @param page
    * @param createTimeBegin
    * @param createTimeEnd
    * @param keyword
    * @param page 分页信息
    * @param createTimeBegin 创建时间开始
    * @param createTimeEnd 创建时间截止
    * @param keyword 查询关键字
    * @return
    */
   public IPage<FlowVO> selectTodoPage(IPage<FlowVO> page, LocalDateTime createTimeBegin, LocalDateTime createTimeEnd, String keyword) {
@@ -81,7 +81,7 @@

      // 构建列表数据
      FlowVO bladeFlow = new FlowVO();
      buildFlowTaskList(bladeFlow, flowList, todoQuery);
      buildFlowTaskList(bladeFlow, flowList, todoQuery,page.getCurrent(),page.getSize());
      flowList.forEach(flowVO -> {
         if(flowVO.getVariables().containsKey("machineCode")){
            //Machine machinemachineService.getByCode((String)flowVO.getVariables().get("machineCode"))
@@ -89,8 +89,7 @@
      });
      // 计算总数
      long count = todoQuery.count();
      // 设置页数
      //page.setSize(count);

      // 设置总数
      page.setTotal(count);
      // 设置数据
@@ -259,7 +258,7 @@
    * @param flowList  流程列表
    * @param taskQuery 任务查询类
    */
   private void buildFlowTaskList(FlowVO bladeFlow, List<FlowVO> flowList, TaskQuery taskQuery) {
   private void buildFlowTaskList(FlowVO bladeFlow, List<FlowVO> flowList, TaskQuery taskQuery,Long currentPage,Long pageSize) {
      if (bladeFlow.getCategory() != null) {
         taskQuery.processCategoryIn(Func.toStrList(bladeFlow.getCategory()));
      }
@@ -273,7 +272,10 @@
         taskQuery.taskCreatedBefore(bladeFlow.getEndDate());
      }

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

         flow.setProcessDefinitionId(task.getProcessDefinitionId());

         flow.setFile(getFileString(task.getProcessInstanceId()));
         //flow.setProcessDefinitionKey(processDefinition.getKey());
         //flow.setProcessDefinitionVersion(processDefinition.getVersion());
         flow.setProcessInstanceId(task.getProcessInstanceId());
@@ -372,7 +375,7 @@

      // 构建列表数据
      FlowVO bladeFlow = new FlowVO();
      buildFlowTaskList(bladeFlow, flowList, todoQuery);//FlowEngineConstant.STATUS_TODO
      buildFlowTaskList(bladeFlow, flowList, todoQuery,page.getCurrent(),page.getSize());//FlowEngineConstant.STATUS_TODO

      // 计算总数
      long count = todoQuery.count();
@@ -413,12 +416,11 @@

      // 构建列表数据
      FlowVO bladeFlow = new FlowVO();
      buildFlowTaskList(bladeFlow, flowList, todoQuery);//FlowEngineConstant.STATUS_TODO
      buildFlowTaskList(bladeFlow, flowList, todoQuery,page.getCurrent(),page.getSize());//FlowEngineConstant.STATUS_TODO

      // 计算总数
      long count = todoQuery.count();
      // 设置页数
      page.setSize(count);

      // 设置总数
      page.setTotal(count);
      // 设置数据
@@ -434,7 +436,7 @@
    * @param keyword
    * @return
    */
   public IPage<FlowVO> selectSearchPage(IPage<FlowVO> page, LocalDate createTimeBegin, LocalDate createTimeEnd, String keyword) {
   public IPage<FlowVO> selectSearchPage(IPage<FlowVO> page, LocalDate createTimeBegin, LocalDate createTimeEnd,String processDefinitionKey,String keyword) {

      List<FlowVO> flowList = new LinkedList<>();
      Date now = new Date();
@@ -445,6 +447,9 @@
      if(Func.isNotEmpty(createTimeEnd)) {
         taskQuery.taskCreatedBefore(DateUtil.toDate(createTimeEnd.plusDays(1)));
      }
      if(Func.isNotEmpty(processDefinitionKey)) {
         taskQuery.processDefinitionKey(processDefinitionKey);
      }

      addKeywordCondition(taskQuery, keyword);

@@ -452,12 +457,10 @@

      // 构建列表数据
      FlowVO bladeFlow = new FlowVO();
      buildFlowTaskList(bladeFlow, flowList, taskQuery);//FlowEngineConstant.STATUS_TODO
      buildFlowTaskList(bladeFlow, flowList, taskQuery,page.getCurrent(),page.getSize());//FlowEngineConstant.STATUS_TODO

      // 计算总数
      long count = taskQuery.count();
      // 设置页数
      page.setSize(count);
      // 设置总数
      page.setTotal(count);
      // 设置数据
@@ -472,10 +475,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) {
@@ -493,7 +496,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());

@@ -509,6 +512,7 @@
         vo.setProcessCreateTime(processInstance.getStartTime());
         vo.setHistoryTaskEndTime(processInstance.getEndTime());

         vo.setFile(getFileString(processInstance.getId()));
         records.add(vo);
      }

@@ -516,4 +520,15 @@

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