yangys
2025-08-02 88748094ae17ca3b6423c54d307f0d5c40c8f420
blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/controller/DispatchController.java
@@ -7,6 +7,7 @@
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.flowable.engine.RuntimeService;
import org.flowable.engine.TaskService;
import org.flowable.task.api.Task;
import org.springblade.core.secure.utils.AuthUtil;
@@ -15,10 +16,12 @@
import org.springblade.core.tool.utils.DateUtil;
import org.springblade.core.tool.utils.Func;
import org.springblade.core.tool.utils.StringUtil;
import org.springblade.mdm.flow.constants.FlowContants;
import org.springblade.mdm.flow.entity.ApproveRecord;
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.ProcessProgRefService;
@@ -42,13 +45,15 @@
   private final StartDispatcher dispatcher;
   private final TaskService taskService;
   private final RuntimeService runtimeService;
   private final ProcessProgRefService processProgRefService;
   private ApproveRecordService approveRecordService;
   private final ApproveRecordService approveRecordService;
   private final FlowCommonService flowCommonService;
   private final FlowProgramFileService flowProgramFileService;
   /**
    * 新增
    * 发起派工流程
    */
   @PostMapping("/start")
   @Operation(summary = "任务计划(派工流程)", description = "启动派工流程")
@@ -60,6 +65,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();
      if(task.getTaskDefinitionKey().equals("programmingTask")) {//编制节点
         String operateResult = variables.get("approve")+"";
         flowProgramFileService.checkProgramFiles(processInstanceId,"Y".equals(operateResult));
      }
      // 增加评论
      if (StringUtil.isNoneBlank(processInstanceId, comment)) {
         taskService.addComment(taskId, processInstanceId, comment);
@@ -69,10 +82,12 @@
         variables = Kv.create();
      }
      String programIds = null;
      if(variables.containsKey("programIds")){
      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));
      }
@@ -80,7 +95,6 @@
      variables.put("approveUserNickName",AuthUtil.getNickName());
      if(variables.containsKey("assignee")){
         addApproveRecord(taskId,processInstanceId,comment,variables);
         //指定了下一步执行人
         taskService.complete(taskId, variables);