yangys
2025-08-06 053a438acf9ec33e182b25211ce8108f0367feac
blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/controller/DispatchController.java
@@ -24,6 +24,7 @@
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;
@@ -52,6 +53,8 @@
   private final FlowCommonService flowCommonService;
   private final FlowProgramFileService flowProgramFileService;
   private final NcNodeAutoCreateService ncNodeAutoCreateService;
   /**
    * 发起派工流程
    */
@@ -69,8 +72,8 @@
      Task task = taskService.createTaskQuery()
         .taskId(taskId)
         .singleResult();
      String operateResult = variables.get("approve")+"";
      if(task.getTaskDefinitionKey().equals("programmingTask")) {//编制节点
         String operateResult = variables.get("approve")+"";
         flowProgramFileService.checkProgramFiles(processInstanceId,"Y".equals(operateResult));
      }
      // 增加评论
@@ -81,6 +84,7 @@
      if (Func.isEmpty(variables)) {
         variables = Kv.create();
      }
      /*
      String programIds = null;
      if(variables.containsKey(FlowContants.PROGRAM_IDS_KEY)){
         programIds = variables.get("programIds").toString();
@@ -90,6 +94,7 @@
         //这已经没用了,直接使用临时文件
         processProgRefService.addRelations(processInstanceId,Func.toLongList(programIds));
      }
      */
      //加入审批用户
      variables.put("approveUserNickName",AuthUtil.getNickName());
@@ -98,7 +103,11 @@
         addApproveRecord(taskId,processInstanceId,comment,variables);
         //指定了下一步执行人
         taskService.complete(taskId, variables);
         //在编制任务时,创建节点(没有节点则创建,有就直接使用
         if(task.getTaskDefinitionKey().equals("programmingTask") && "Y".equals(operateResult)) {
            ncNodeAutoCreateService.createNodeTreeWithProgram(flowCommonService.getProgramProperties(processInstanceId));
         }
         return R.success("流程提交成功");
      }else {
         // 完成任务,给默认用户