yangys
2025-07-23 71a55d8d0d886eb6e489a7b581eb799f3a8ad054
blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/CureFlowService.java
@@ -4,6 +4,7 @@
import org.flowable.engine.HistoryService;
import org.flowable.engine.IdentityService;
import org.flowable.engine.RuntimeService;
import org.flowable.engine.history.HistoricProcessInstance;
import org.flowable.engine.runtime.ProcessInstance;
import org.flowable.task.api.history.HistoricTaskInstance;
import org.springblade.core.secure.utils.AuthUtil;
@@ -67,22 +68,29 @@
    * @param prog 数控程序实体
    */
   public void startOne(NcProgram prog){
      Map<String, Object> vars = new HashMap<>();
      //NcProgram prog = programs.get(0);
      Machine machine = machineService.getByCode(prog.getMachineCode());
      vars.put("machineCode",prog.getMachineCode());
      vars.put("machineMode",machine.getName());
      vars.put("processEdition",prog.getProcessEdition());
      //该程序在计划任务时 获取编制,校对,审批的人员,作为默认用户,其中编制时第一个固定的用户
      Map<String, Object> vars = null;
         //该程序在计划任务时 获取编制,校对,审批的人员,作为默认用户,其中编制时第一个固定的用户
      ProcessProgRef preRef = processProgRefService.lastDispatchDataByNcProgramId(prog.getId());
      //获取审批用户
      List<HistoricTaskInstance> historicTasks = historyService.createHistoricTaskInstanceQuery()
         .processInstanceId(preRef.getProcessInstanceId())
         .orderByHistoricTaskInstanceEndTime().desc()
         .list();
      if(preRef != null) {
         //获取审批用户
         /*
         List<HistoricTaskInstance> historicTasks = historyService.createHistoricTaskInstanceQuery().includeProcessVariables()
            .processInstanceId(preRef.getProcessInstanceId())
            .orderByHistoricTaskInstanceEndTime().desc()
            .list();*/
         HistoricProcessInstance instance = historyService.createHistoricProcessInstanceQuery()
            .processInstanceId(preRef.getProcessInstanceId()).includeProcessVariables()
            .singleResult();
         if(instance != null) {//使用任务派工流程的变量
            vars = new HashMap<>(instance.getProcessVariables());
         }
      }
      if(vars == null){
         vars = new HashMap<>();
      }
      /*
      String programmer = null;
      String checker = null;
      String senior = null;
@@ -100,10 +108,10 @@
            senior = task.getAssignee();
         }
      }
      vars.put("programmer",programmer);
      vars.put("checker",checker);
      vars.put("senior",senior);
      }*/
      //vars.put("programmer",programmer);
      //vars.put("checker",checker);
      //vars.put("senior",senior);
      String businessKey = "0";//业务表key
@@ -115,7 +123,6 @@
      ref.setNcProgramId(prog.getId());
      processProgRefService.save(ref);
   }
   /**