修复审批表，确认表内容

yangys

2025-09-23 3baca21e0e6563f8379359ef2ba78c224eb4bc80

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

@@ -1,9 +1,21 @@
package org.springblade.mdm.flow.service;

import com.alibaba.excel.util.StringUtils;
import lombok.AllArgsConstructor;
import org.flowable.engine.HistoryService;
import org.flowable.engine.RuntimeService;
import org.flowable.engine.history.HistoricProcessInstance;
import org.flowable.engine.runtime.ProcessInstance;
import org.springblade.mdm.flow.constants.FlowContants;
import org.springblade.core.tool.utils.Func;
import org.springblade.mdm.basesetting.machine.service.MachineService;
import org.springblade.mdm.basesetting.machine.entity.Machine;
import org.springblade.mdm.basesetting.producedivision.entity.ProduceDivision;
import org.springblade.mdm.basesetting.producedivision.service.ProduceDivisionService;
import org.springblade.mdm.commons.service.UserCommonService;
import org.springblade.mdm.flow.constants.FlowConstant;
import org.springblade.mdm.flow.constants.FlowVariableConstant;
import org.springblade.mdm.program.entity.NcNode;
import org.springblade.mdm.program.service.NodeDeptQueryService;
import org.springframework.stereotype.Service;

import java.util.Map;
@@ -12,7 +24,11 @@
@Service
public class FlowCommonService {
   private final RuntimeService runtimeService;

   private final HistoryService historyService;
   private final ProduceDivisionService produceDivisionService;
   private final NodeDeptQueryService nodeDeptQueryService;
   private final MachineService machineService;
   private final UserCommonService userCommonService;
   /**
    * 根据流程实例id获取definitionKey
    * @param processInstanceId
@@ -36,20 +52,177 @@
      programProperties.setProcessInstanceId(processInstanceId);

      Map<String, Object> vars = runtimeService.getVariables(processInstanceId);
      this.copyFlowPropertiesFromMap(programProperties, vars);

      programProperties.setDrawingNo(String.valueOf(vars.get(FlowContants.DRAWING_NO)));
      programProperties.setDrawingNoEdition(String.valueOf(vars.get(FlowContants.DRAWING_NO_EDITION)));
      programProperties.setProductModel(String.valueOf(vars.get(FlowContants.PRODUCT_MODEL)));
      ProcessInstance processInstance = runtimeService.createProcessInstanceQuery()
         .processInstanceId(processInstanceId)
         .singleResult();
      String processDefinitionKey = processInstance.getProcessDefinitionKey();
      programProperties.setProcessDefinitionKey(processDefinitionKey);
      return programProperties;
   }
   public FlowProgramProperties getProgramPropertiesFromHis(String processInstanceId) {
      HistoricProcessInstance historicInstance = historyService.createHistoricProcessInstanceQuery().includeProcessVariables()
         .processInstanceId(processInstanceId)
         .singleResult();

      programProperties.setProcessNo(String.valueOf(vars.get(FlowContants.PROCESS_NO)));
      programProperties.setProcessEdition(String.valueOf(vars.get(FlowContants.PROCESS_EDITION)));//工序版次
      programProperties.setProcessName(String.valueOf(vars.get(FlowContants.PROCESS_NAME)));
      programProperties.setMachineCode(String.valueOf(vars.get(FlowContants.MACHINE_CODE)));
      //数据处理名称为版次以前，零件号加工序号：YZL4-1100-01-50 零组件号：YZL4-1100-01 工序号 50
      FlowProgramProperties programProperties = new FlowProgramProperties();
      programProperties.setProcessInstanceId(processInstanceId);

      programProperties.setCraftEdition(String.valueOf(vars.get(FlowContants.CRAFT_EDITION)));
      programProperties.setHasCuredProgram(String.valueOf(vars.get(FlowContants.HAS_CURED_PROGRAM)));
      Map<String, Object> vars =historicInstance.getProcessVariables();
      this.copyFlowPropertiesFromMap(programProperties,vars);

      programProperties.setProcessDefinitionKey(historicInstance.getProcessDefinitionKey());
      return programProperties;
   }

   /**
    * 从map中赋值流程便利到vo
    * @param programProperties vo
    * @param vars 变量map
    */
   void copyFlowPropertiesFromMap(FlowProgramProperties programProperties,Map<String, Object> vars){

      programProperties.setTitle(String.valueOf(vars.get(FlowVariableConstant.TITLE)));
      programProperties.setIsTempFlow(Func.toStr(vars.get(FlowVariableConstant.IS_TEMP_FLOW)));
      programProperties.setDrawingNo(String.valueOf(vars.get(FlowVariableConstant.DRAWING_NO)));
      programProperties.setDrawingNoEdition(String.valueOf(vars.get(FlowVariableConstant.DRAWING_NO_EDITION)));
      programProperties.setProductModel(String.valueOf(vars.get(FlowVariableConstant.PRODUCT_MODEL)));

      programProperties.setProcessNo(String.valueOf(vars.get(FlowVariableConstant.PROCESS_NO)));
      programProperties.setProcessEdition(String.valueOf(vars.get(FlowVariableConstant.PROCESS_EDITION)));//工序版次
      programProperties.setProcessName(String.valueOf(vars.get(FlowVariableConstant.PROCESS_NAME)));
      programProperties.setMachineCode(String.valueOf(vars.get(FlowVariableConstant.MACHINE_CODE)));
      programProperties.setMachineGroupCode(String.valueOf(vars.get(FlowVariableConstant.MACHINE_GROUP_CODE)));
      programProperties.setMachineMode(String.valueOf(vars.get(FlowVariableConstant.MACHINE_MODE)));
      //数据处理名称为版次以前，零件号加工序号：YZL4-1100-01-50 零组件号：YZL4-1100-01 工序号 50

      programProperties.setCraftEdition(String.valueOf(vars.get(FlowVariableConstant.CRAFT_EDITION)));
      programProperties.setHasCuredProgram(String.valueOf(vars.get(FlowVariableConstant.HAS_CURED_PROGRAM)));
      programProperties.setIsProcessEditionSame(String.valueOf(vars.get(FlowVariableConstant.IS_PROCESS_EDITION_SAME)));
      if(vars.containsKey(FlowVariableConstant.DEVIATION)) {
         programProperties.setDeviation(String.valueOf(vars.get(FlowVariableConstant.DEVIATION)));
      }
      if(vars.containsKey(FlowVariableConstant.CURED_NODE_ID)){
         programProperties.setCuredNodeId(Func.toLong(vars.get(FlowVariableConstant.CURED_NODE_ID)));
      }
      if(vars.containsKey(FlowConstant.NODE_ID)){
         programProperties.setNodeId(Func.toLong(vars.get(FlowConstant.NODE_ID)));
      }
      programProperties.setCureProgramUseable(String.valueOf(vars.get(FlowConstant.CURE_PROGRAM_USEABLE)));

      programProperties.setTeamLeaderId(Func.toLong(vars.get(FlowVariableConstant.TEAM_LEADER)));
      programProperties.setProgrammerId(Func.toLong(vars.get(FlowVariableConstant.PROGRAMMER)));
      programProperties.setCheckerId(Func.toLong(vars.get(FlowVariableConstant.CHECKER)));
      programProperties.setSeniorId(Func.toLong(vars.get(FlowVariableConstant.SENIOR)));

      programProperties.setProgramNo(Func.toStr(vars.get(FlowVariableConstant.PROGRAM_NO)));

      programProperties.setActProgrammerId(Func.toLong(vars.get(FlowVariableConstant.ACT_PROGRAMMER)));
      programProperties.setActCheckerId(Func.toLong(vars.get(FlowVariableConstant.ACT_CHECKER)));
      programProperties.setActSeniorId(Func.toLong(vars.get(FlowVariableConstant.ACT_SENIOR)));
      programProperties.setProgrammerName(Func.toStr(vars.get("programmerName")));

      programProperties.setProgramOnMachine(Func.toStr(vars.get(FlowVariableConstant.PROGRAM_ON_MACHINE)));
   }
   /**
    * 流程是否在进行
    * @param processInstanceId 实例id
    */
   public boolean isProcessInstanceActive(String processInstanceId) {
      if(processInstanceId == null){
         return false;
      }
      // 先查运行时表
      ProcessInstance instance = runtimeService.createProcessInstanceQuery()
         .processInstanceId(processInstanceId)
         .singleResult();

      if (instance != null) {
         return true;
      }

      // 再查历史表确认是否曾经存在
      HistoricProcessInstance historicInstance = historyService.createHistoricProcessInstanceQuery()
         .processInstanceId(processInstanceId)
         .singleResult();

      return historicInstance != null && historicInstance.getEndTime() == null;
   }

   /**
    * 上一步处理人
    * @param processInstanceId 流程实例id
    * @return assignee
    */
   /*
    public String previusAssignee(String processInstanceId) {
      // 获取历史任务实例
      List<HistoricTaskInstance> historicTasks = historyService.createHistoricTaskInstanceQuery()
         .processInstanceId(processInstanceId)
         .orderByHistoricTaskInstanceEndTime().asc()
         .list();

      // 获取上一个已完成的任务
      String assignee = "";
      if(!historicTasks.isEmpty()) {
         assignee = historicTasks.get(historicTasks.size() - 1).getAssignee();
      }
      return assignee;
    }*/

   /**
    * 将默认审批用户放入map中
    * @param vars 启动流程的变量map
    * @param drawingNo 零组件号
    */
   public ProduceDivision putDefaultAssignees(Map<String, Object> vars,String drawingNo,String defaultAssignee){
      ProduceDivision div = produceDivisionService.getByDrawingNoWithQinzhe(drawingNo);
      vars.put(FlowVariableConstant.TEAM_LEADER,div.getTeamLeaderId());
      vars.put(FlowVariableConstant.PROGRAMMER,div.getProgrammerId());
      vars.put(FlowVariableConstant.CHECKER,div.getCheckerId());
      vars.put(FlowVariableConstant.SENIOR,div.getSeniorId());
      if(StringUtils.isNotBlank(defaultAssignee)) {
         vars.put(FlowVariableConstant.ASSIGNEE, defaultAssignee);//第一个审批用户：组长
      }

      vars.put(FlowConstant.PROGRAMMER_NAME, userCommonService.getUserNameById(div.getProgrammerId()));
      return div;
   }

   /**
    * 根据程序包名节点，填充变量map
    * @param vars
    * @param programPackageNode
    */
   public void putFlowVariablesByNode(Map<String, Object> vars, NcNode programPackageNode){
      //机床编号
      vars.put(FlowVariableConstant.MACHINE_CODE,programPackageNode.getMachineCode());
      vars.put(FlowVariableConstant.MACHINE_GROUP_CODE,programPackageNode.getMachineGroupCode());

      Machine machine = machineService.getByCode(programPackageNode.getMachineCode());
      //机床型号
      if(machine != null) {
         vars.put(FlowVariableConstant.MACHINE_MODE, machine.getName());
      }
      vars.put(FlowVariableConstant.PROCESS_NO,programPackageNode.getProcessNo());
      vars.put(FlowVariableConstant.PROCESS_NAME,programPackageNode.getProcessName());
      vars.put(FlowVariableConstant.PROCESS_EDITION,programPackageNode.getProcessEdition());
      vars.put(FlowVariableConstant.CRAFT_EDITION,programPackageNode.getCraftEdition());

      vars.put(FlowVariableConstant.DRAWING_NO,programPackageNode.getDrawingNo());
      vars.put(FlowVariableConstant.DRAWING_NO_EDITION,programPackageNode.getDrawingNoEdition());

      vars.put(FlowVariableConstant.PROGRAM_PACKAGE_NAME,programPackageNode.getName());

      vars.put(FlowVariableConstant.PRODUCT_MODEL,programPackageNode.getProductModel());
      vars.put(FlowConstant.NODE_ID, programPackageNode.getId());
      vars.put(FlowVariableConstant.WORKSHOP,nodeDeptQueryService.getWorkshopNameByMachineCode(programPackageNode.getMachineCode()));

      if(programPackageNode.isDeviationProgram()) {
         vars.put(FlowVariableConstant.DEVIATION, programPackageNode.getDeviation());
      }
   }
}