yangys
2025-08-06 1911be8941e5fe2705c2c56e74e52bd426468793
blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/controller/DispatchController.java
@@ -21,8 +21,10 @@
import org.springblade.mdm.flow.excution.StartDispatcher;
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.TaskAssignVO;
import org.springblade.mdm.program.entity.ProcessProgRef;
import org.springblade.mdm.program.service.NcNodeAutoCreateService;
import org.springblade.mdm.program.service.ProcessProgRefService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping;
@@ -47,10 +49,14 @@
   private final RuntimeService runtimeService;
   private final ProcessProgRefService processProgRefService;
   private ApproveRecordService approveRecordService;
   private final ApproveRecordService approveRecordService;
   private final FlowCommonService flowCommonService;
   private final FlowProgramFileService flowProgramFileService;
   private final NcNodeAutoCreateService ncNodeAutoCreateService;
   /**
    * 新增
    * 发起派工流程
    */
   @PostMapping("/start")
   @Operation(summary = "任务计划(派工流程)", description = "启动派工流程")
@@ -62,6 +68,14 @@
   @Operation(summary = "完成任务", description = "流向下一个节点")
   @PostMapping("completeTask")
   public R<Void> completeTask(String taskId, String processInstanceId, String comment,@Parameter(name = "variables", description = "任务变量") @RequestBody Map<String, Object> variables) {
      Task task = taskService.createTaskQuery()
         .taskId(taskId)
         .singleResult();
      String operateResult = variables.get("approve")+"";
      if(task.getTaskDefinitionKey().equals("programmingTask")) {//编制节点
         flowProgramFileService.checkProgramFiles(processInstanceId,"Y".equals(operateResult));
      }
      // 增加评论
      if (StringUtil.isNoneBlank(processInstanceId, comment)) {
         taskService.addComment(taskId, processInstanceId, comment);
@@ -70,21 +84,18 @@
      if (Func.isEmpty(variables)) {
         variables = Kv.create();
      }
      String programIds = null;
      if(variables.containsKey(FlowContants.PROGRAM_IDS_KEY)){
         programIds = variables.get("programIds").toString();
         runtimeService.setVariable(taskId, FlowContants.PROGRAM_IDS_KEY, programIds);
      }
      if(StringUtils.isNotEmpty(programIds)) {
         processProgRefService.addRelations(processInstanceId,Func.toLongList(programIds));
      }
      //加入审批用户
      variables.put("approveUserNickName",AuthUtil.getNickName());
      variables.put(FlowContants.LAST_STEP_USER_NICKNAME,AuthUtil.getNickName());
      if(variables.containsKey("assignee")){
         addApproveRecord(taskId,processInstanceId,comment,variables);
         //在编制任务时,创建节点(没有节点则创建,有就直接使用
         if(task.getTaskDefinitionKey().equals("programmingTask") && "Y".equals(operateResult)) {
            ncNodeAutoCreateService.createNodeTreeWithProgram(flowCommonService.getProgramProperties(processInstanceId));
         }
         //指定了下一步执行人
         taskService.complete(taskId, variables);