修复替换流程bug

yangys

2025-09-11 0975559314f1d4ee44a03e87c2b369f1d3e0ff8b

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

@@ -1,25 +1,20 @@
package org.springblade.mdm.flow.service;

import lombok.AllArgsConstructor;
import org.apache.commons.lang3.StringUtils;
import org.flowable.engine.IdentityService;
import org.flowable.engine.RuntimeService;
import org.flowable.engine.TaskService;
import org.flowable.engine.runtime.ProcessInstance;
import org.flowable.task.api.Task;
import org.simpleframework.xml.core.Replace;
import org.springblade.core.log.exception.ServiceException;
import org.springblade.core.oss.OssTemplate;
import org.springblade.core.oss.model.BladeFile;
import org.springblade.core.secure.utils.AuthUtil;
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.flow.constants.FlowContants;
import org.springblade.mdm.flow.constants.FlowVariableContants;
import org.springblade.mdm.flow.entity.FlowProgramFile;
import org.springblade.mdm.flow.entity.ReplaceProgramFile;
import org.springblade.mdm.flow.vo.ReplaceFlowStartVO;
import org.springblade.mdm.flow.vo.ReplaceUploadVO;
import org.springblade.mdm.flow.vo.TaskAssignVO;
import org.springblade.mdm.program.entity.NcNode;
import org.springblade.mdm.program.service.NcNodeService;
import org.springblade.mdm.program.service.NodeDeptQueryService;
@@ -28,16 +23,13 @@
import org.springblade.mdm.utils.EntityUtil;
import org.springblade.mdm.utils.ProgramFileNameCheckUtil;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.multipart.MultipartFile;

import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;

@AllArgsConstructor
@Service
@@ -47,39 +39,11 @@
   private final TaskService taskService;
   private final IdentityService identityService;
   private final FlowProgramFileService flowProgramFileService;
   private final ReplaceProgramFileService replaceProgramFileService;
   private final ProgramFlowStatusQueryService flowStatusQueryService;
   private final NodeDeptQueryService nodeDeptQueryService;
   private OssTemplate ossTemplate;
   public static final String NODE_ID = "nodeId";
   /**
     * 转派，并记录自己的备注信息
    * @param nodeId 替换的节点id
    */
   /*
   @Transactional
   public void prestart(long nodeId,String tempInstanceId) {
      List<NcNode> fileNodes = nodeService.lambdaQuery()
         .eq(NcNode::getParentId, nodeId)
         .eq(NcNode::getIsLastEdition,1)
         .eq(NcNode::getNodeType,NcNode.TYPE_PROGRAM_FILE).list();
      List<Long> fileIds = fileNodes.stream().map(NcNode::getFlowProgramFileId).toList();

      List<FlowProgramFile> programFiles = flowProgramFileService.lambdaQuery()
         .in(FlowProgramFile::getId, fileIds).list();


      //将现有文件复制到独立的表中，后续作为审批的文件，审批界面调用的接口也不同，最好单独开发
      for(FlowProgramFile programFile : programFiles) {
         FlowProgramFile newFile = new FlowProgramFile();
         BeanUtils.copyProperties(programFile, newFile);
         EntityUtil.clearBaseProperties(newFile);
         newFile.setProcessInstanceId(tempInstanceId);
         flowProgramFileService.save(newFile);
      }
   }

    */
   private final FlowCommonService flowCommonService;
   private final OssTemplate ossTemplate;
   private final MachineService machineService;

   /**
    * 准备替换流程需要的数据
@@ -135,45 +99,28 @@
    */
   @Transactional
   public void start(ReplaceFlowStartVO startVO){
      flowProgramFileService.checkProgramFiles(startVO.getTempInstanceId(),true);
      NcNode programPackage = nodeService.getById(startVO.getNodeId());

      Map<String, Object> vars = new HashMap<>();
      vars.put(FlowContants.ASSIGNEE,startVO.getAssignee());//第一个审批用户

      flowCommonService.putFlowVariablesByNode(vars,programPackage);
      flowCommonService.putDefaultAssignees(vars,programPackage.getDrawingNo(),startVO.getAssignee()+"");

      vars.put(FlowContants.TITLE,startVO.getTitle());
      NcNode programPackage = nodeService.getById(startVO.getNodeId());
      //机床编号
      vars.put(FlowContants.MACHINE_CODE,programPackage.getMachineCode());
      //Machine machine = machineService.getByCode(programPackge.getMachineCode());
      //机床型号
      //if(machine != null) {
         //vars.put(FlowContants.MACHINE_MODE, programPackge.getMachineMode());
      //}
      vars.put(FlowContants.PROCESS_NO,programPackage.getProcessNo());
      vars.put(FlowContants.PROCESS_NAME,programPackage.getProcessName());
      vars.put(FlowContants.PROCESS_EDITION,programPackage.getProcessEdition());
      vars.put(FlowContants.CRAFT_EDITION,programPackage.getCraftEdition());

      vars.put(FlowContants.DRAWING_NO,programPackage.getDrawingNo());
      vars.put(FlowContants.DRAWING_NO_EDITION,programPackage.getDrawingNoEdition());

      vars.put(FlowContants.PROGRAM_PACKAGE_NAME,programPackage.getName());

      vars.put(FlowContants.PRODUCT_MODEL,programPackage.getProductModel());
      vars.put(NODE_ID, startVO.getNodeId());

      vars.put("comment", startVO.getComment());
      identityService.setAuthenticatedUserId(String.valueOf(AuthUtil.getUserId()));//设置流程发起人
      vars.put(FlowContants.MY_PROCESS_NAME,"替换流程");

      String userId = String.valueOf(AuthUtil.getUserId());
      identityService.setAuthenticatedUserId(userId);//设置流程发起人
      vars.put(FlowVariableContants.ACT_PROGRAMMER,userId);//发起人按照实际编程人员算

      ProcessInstance inst = runtimeService.startProcessInstanceByKey(FlowContants.REPLACE_PROCESS_KEY,startVO.getNodeId()+"",vars);
      //replaceProgramFileService.lambdaUpdate().eq(ReplaceProgramFile::getTempId,startVO.getTempId()).set(ReplaceProgramFile::getProcessInstanceId,inst.getProcessInstanceId());
      //更新节点的流程id，避免重复发起流程
      programPackage.setProcessInstanceId(inst.getId());
      this.nodeService.updateById(programPackage);

      /*
      Task startTask = taskService.createTaskQuery()
         .processInstanceId(inst.getId())
         .singleResult();

      // 添加评论
      taskService.addComment(startTask.getId(), inst.getProcessInstanceId(),startVO.getComment());
      */
      flowProgramFileService.lambdaUpdate()
         .eq(FlowProgramFile::getProcessInstanceId,startVO.getTempInstanceId())
         .set(FlowProgramFile::getProcessInstanceId,inst.getProcessInstanceId()).update();
@@ -187,7 +134,6 @@
    */
   public void uploadReplaceProgramFile(ReplaceUploadVO uploadVO) {

      //FlowProgramProperties progProps= flowCommonService.getProgramProperties(uploadVO.getProcessInstanceId());
      MultipartFile file = uploadVO.getFile();
      if(file.getSize() == 0){
         throw new ServiceException("程序文件不可为空文件");
@@ -196,10 +142,12 @@
      progProps.setDrawingNo(uploadVO.getDrawingNo());
      progProps.setProcessNo(uploadVO.getProcessNo());
      progProps.setProcessEdition(uploadVO.getProcessEdition());
      if(FlowProgramFile.TYPE_PROGRAM.equals(uploadVO.getFileType())) {
         ProgramFileNameCheckUtil.checkFilename(file.getOriginalFilename(),progProps);
      }

      ProgramFileNameCheckUtil.checkFilename(file.getOriginalFilename(),progProps);

      String programName = NcNodeService.genProgramName(progProps.getDrawingNo(),progProps.getProcessNo());
      String programName = NcNodeService.genProgramName(progProps.getDrawingNo(),progProps.getProcessNo(),progProps.getProcessEdition());

      BladeFile bfile = ossTemplate.putFile(file);