优化代码

yangys

2025-08-07 a0881c9a8dbff2bf7f3e10255b998b9529c7aef3

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

@@ -51,13 +51,6 @@

   private final FlowProgramFileService flowProgramFileService;

   /**
    * 固化流程的key
    */
   private static final String PROCESS_KEY = "program-cure";



   @Transactional
   public void startCure(List<NcNode> programPackageList, Map<Long,List<NcNode>> allFlowProgramFiles) {
      //根据分组启动流程，并插入关联表
@@ -71,7 +64,7 @@
    * @param programPackage 程序包名 节点实体
    */
   public void startOne(NcNode programPackage,List<NcNode> programNodes) {
      Map<String, Object> vars = null;
      Map<String, Object> vars = new HashMap<>();
      //该程序在计划任务时 获取编制，校对，审批的人员，作为默认用户，其中编制时第一个固定的用户
      if(programPackage.getProcessInstanceId() != null) {
         //获取审批用户
@@ -79,13 +72,21 @@
            .processInstanceId(programPackage.getProcessInstanceId()).includeProcessVariables()
            .singleResult();
         if(instance != null) {//使用任务派工流程的变量
            vars = new HashMap<>(instance.getProcessVariables());
            vars.remove("proessInstanceId");
            Map<String, Object> oldVars = instance.getProcessVariables();
            //机床编号
            vars.put(FlowContants.MACHINE_CODE,oldVars.get(FlowContants.MACHINE_CODE));
            //机床型号
            vars.put(FlowContants.MACHINE_MODE,oldVars.get(FlowContants.MACHINE_MODE));
            vars.put(FlowContants.PROCESS_NO,oldVars.get(FlowContants.PROCESS_NO));
            vars.put(FlowContants.PROCESS_NAME,oldVars.get(FlowContants.PROCESS_NAME));
            vars.put(FlowContants.PROCESS_EDITION,oldVars.get(FlowContants.PROCESS_EDITION));
            vars.put(FlowContants.CRAFT_EDITION, oldVars.get(FlowContants.CRAFT_EDITION));
            vars.put(FlowContants.DRAWING_NO,oldVars.get(FlowContants.DRAWING_NO));
            vars.put(FlowContants.DRAWING_NO_EDITION,oldVars.get(FlowContants.DRAWING_NO_EDITION));

            vars.put(FlowContants.PRODUCT_MODEL,oldVars.get(FlowContants.PRODUCT_MODEL));
         }

      }
      if(vars == null){
         vars = new HashMap<>();
      }

      //查找历史实际的审批人
@@ -100,7 +101,8 @@

      vars.put(FlowContants.LAST_STEP_USER_NICKNAME, AuthUtil.getNickName());
      vars.put(FlowContants.TITLE,programPackage.getName()+"-固化");//自动增加标题
      ProcessInstance inst = runtimeService.startProcessInstanceByKey(PROCESS_KEY,businessKey,vars);

      ProcessInstance inst = runtimeService.startProcessInstanceByKey(FlowContants.CURE_PROCESS_KEY,businessKey,vars);

      //更新程序包名节点的流程实例id
      programPackage.setProcessInstanceId(inst.getProcessInstanceId());
@@ -152,9 +154,10 @@

      }

      vars.put("programmer",programmer);
      vars.put("checker",checker);
      vars.put("senior",senior);
      vars.put(FlowContants.PROGRAMMER,programmer);
      vars.put(FlowContants.CHECKER,checker);
      vars.put(FlowContants.SENIOR,senior);
      vars.put(FlowContants.ASSIGNEE,programmer);
   }
   /**
    * 将程序按照机器代码分组