清除无用的显示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,7 +47,8 @@
   private final IUserClient userClient;
   private final ProcessProgRefService processProgRefService;
   private final ApproveRecordService approveRecordService;

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

         flow.setProcessDefinitionId(task.getProcessDefinitionId());

         flow.setFile(getFileString(task.getProcessInstanceId()));
         //flow.setProcessDefinitionKey(processDefinition.getKey());
         //flow.setProcessDefinitionVersion(processDefinition.getVersion());
         flow.setProcessInstanceId(task.getProcessInstanceId());
@@ -474,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) {
@@ -495,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());

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

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

@@ -518,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;
   }
}