修复替换流程bug

yangys

2025-09-11 0975559314f1d4ee44a03e87c2b369f1d3e0ff8b

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

@@ -7,10 +7,13 @@
import org.flowable.task.api.Task;
import org.springblade.core.log.exception.ServiceException;
import org.springblade.core.tool.support.Kv;
import org.springblade.core.tool.utils.Func;
import org.springblade.core.tool.utils.StringUtil;
import org.springblade.mdm.commons.service.UserCommonService;
import org.springblade.mdm.flow.constants.FlowContants;
import org.springblade.mdm.flow.constants.FlowVariableContants;
import org.springblade.mdm.flow.service.ApproveRecordService;
import org.springblade.mdm.flow.service.FlowCommonService;
import org.springblade.mdm.flow.service.FlowProgramFileService;
import org.springblade.mdm.flow.vo.BatchDispatchVO;
import org.springblade.mdm.program.service.NcNodeAutoCreateService;
@@ -32,6 +35,10 @@
   private TaskService taskService;
   @Autowired
   private RuntimeService runtimeService;
   @Autowired
   private FlowCommonService flowCommonService;
   @Autowired
   private UserCommonService userCommonService;
   @Transactional
   public void batchDispatchTask(BatchDispatchVO batchDispatchVO) {
      //String[] taskIds, String[] processInstanceIds, String comment, String assignee
@@ -51,16 +58,19 @@
         taskId = taskIds[i];
         processInstanceId = batchDispatchVO.getProcessInstanceIds()[i];

         Task task = taskService.createTaskQuery()
            .taskId(taskId)
            .singleResult();
         taskService.complete(taskId, variables);
         runtimeService.setVariable(processInstanceId,FlowContants.PROGRAMMER_NAME,userCommonService.getUserNameById(Func.toLong(batchDispatchVO.getAssignee())));

         Task task = getTask(taskId);

         if(!task.getTaskDefinitionKey().equals("teamLeaderTask")){
            throw new ServiceException("非[任务分派]节点的任务不能批量派工");
         }
         if (StringUtil.isNoneBlank(processInstanceId, comment)) {
            taskService.addComment(taskId, processInstanceId, comment);
         }

         approveRecordService.saveApproveRecords(task,FlowContants.Y,comment);

         taskService.complete(taskId, variables);
      }
   }

@@ -86,19 +96,31 @@
         taskId = taskIds[i];
         processInstanceId = batchDispatchVO.getProcessInstanceIds()[i];

         variables.put("assignee", getAutoProgrammer(processInstanceId));
         Task task = getTask(taskId);
         if(!task.getTaskDefinitionKey().equals("teamLeaderTask")){
            throw new ServiceException("非[任务分派]节点的任务不能批量派工");
         }

         Task task = taskService.createTaskQuery()
            .taskId(taskId)
            .singleResult();
         taskService.complete(taskId, variables);
         Object programmerId = getAutoProgrammer(processInstanceId);
         variables.put("assignee", programmerId);

         runtimeService.setVariable(processInstanceId,FlowContants.PROGRAMMER_NAME,userCommonService.getUserNameById(Func.toLong(programmerId)));


         if (StringUtil.isNoneBlank(processInstanceId, batchDispatchVO.getComment())) {
            taskService.addComment(taskId, processInstanceId, batchDispatchVO.getComment());
         }

         approveRecordService.saveApproveRecords(task,FlowContants.Y,batchDispatchVO.getComment());

         //最后一步完成
         taskService.complete(taskId, variables);
      }
   }

   private Task getTask(String taskId) {
      return taskService.createTaskQuery()
         .taskId(taskId)
         .singleResult();
   }

   /**
@@ -107,7 +129,7 @@
    * @return
    */
   Object getAutoProgrammer(String processInstanceId){
      ProcessInstance processInstance = runtimeService.createProcessInstanceQuery()
      ProcessInstance processInstance = runtimeService.createProcessInstanceQuery().includeProcessVariables()
         .processInstanceId(processInstanceId)
         .singleResult();
      Object programmer = processInstance.getProcessVariables().get(FlowContants.PROGRAMMER);
@@ -123,7 +145,6 @@
    */
   @Transactional
   public void batchApprove(BatchDispatchVO batchDispatchVO) {
      //TODO 待实现
      checkBatchParameter(batchDispatchVO);
      String[] taskIds = batchDispatchVO.getTaskIds();
      String taskId;
@@ -132,24 +153,42 @@
      //审批结果和处理人都一样的
      Map<String, Object> variables = Kv.create();
      variables.put(FlowVariableContants.APPROVE, batchDispatchVO.getApprove());
      variables.put(FlowVariableContants.ASSIGNEE, batchDispatchVO.getAssignee());
      variables.put(FlowVariableContants.COMMENT, batchDispatchVO.getComment());

      for(int i=0;i<taskIds.length;i++) {
         taskId = taskIds[i];
         processInstanceId = batchDispatchVO.getProcessInstanceIds()[i];

         Task task = taskService.createTaskQuery()
            .taskId(taskId)
            .singleResult();
         taskService.complete(taskId, variables);
         Task task = getTask(taskId);

         if (StringUtil.isNoneBlank(processInstanceId, batchDispatchVO.getComment())) {
            taskService.addComment(taskId, processInstanceId, batchDispatchVO.getComment());
         }
         if(FlowContants.N.equals(batchDispatchVO.getApprove())) {
            //驳回，查询实际编程人员 驳回
            variables.put(FlowVariableContants.ASSIGNEE, getActualProgrammer(processInstanceId));
         }
         //approveRecordService.saveApproveRecords(task,FlowContants.Y,batchDispatchVO.getComment());

         approveRecordService.saveApproveRecords(task,FlowContants.Y,batchDispatchVO.getComment());
         taskService.complete(taskId, variables);
      }
   }

   /**
    * 获取流程执行中实际的编程人员（执行上传文件的人）
    * @param processInstanceId 流程实例id
    * @return 编程人员id
    */
   Object getActualProgrammer(String processInstanceId){
      ProcessInstance processInstance = runtimeService.createProcessInstanceQuery().includeProcessVariables()
         .processInstanceId(processInstanceId)
         .singleResult();
      Object actProgrammer = processInstance.getProcessVariables().get(FlowVariableContants.ACT_PROGRAMMER);
      if(actProgrammer == null){
         throw new ServiceException(processInstance.getProcessVariables().get(FlowContants.TITLE)+":未找到编程人员");
      }
      return actProgrammer;
   }
   /**
    * 验证批量处理参数
    * @param batchDispatchVO 批量处理参数对象