yangys
2025-09-18 0d61b9bfca526e9c3da2209de8f9f367e76fd013
blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/execute/ReplaceFlowCompleteService.java
@@ -6,10 +6,9 @@
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.flow.constants.FlowContants;
import org.springblade.mdm.flow.constants.FlowVariableConstant;
import org.springblade.mdm.flow.service.FlowCommonService;
import org.springblade.mdm.flow.service.FlowProgramFileService;
import org.springblade.mdm.flow.service.FlowProgramProperties;
import org.springblade.mdm.program.service.NcNodeAutoCreateService;
import org.springblade.mdm.program.service.NcNodeService;
import org.springframework.beans.factory.annotation.Autowired;
@@ -36,27 +35,30 @@
   @Override
   public void completeTask(String taskId, String processInstanceId, String comment, Map<String, Object> variables) {
      Task task = currentTask(taskId);
      // 非空判断
      if (Func.isEmpty(variables)) {
         variables = Kv.create();
      }
      String operateResult = this.getApproveResult(variables);
      if(task.getTaskDefinitionKey().equals("replaceProgrammingTask")) {//编制节点
         variables.put(FlowVariableConstant.ACT_PROGRAMMER,Func.toStr(AuthUtil.getUserId()));
         flowProgramFileService.checkProgramFiles(processInstanceId,"Y".equals(operateResult));
      }
      if (StringUtil.isNoneBlank(processInstanceId, comment)) {
         taskService.addComment(taskId, processInstanceId, comment);
      }
      // 非空判断
      if (Func.isEmpty(variables)) {
         variables = Kv.create();
      }
      variables.put(FlowContants.LAST_STEP_USER_NICKNAME, AuthUtil.getNickName());
      variables.put(FlowVariableConstant.LAST_STEP_USER_NICKNAME, AuthUtil.getNickName());
      if(!variables.containsKey("assignee")) {
         throw new ServiceException("请指定流程下一步处理人");
      }
      addApproveRecord(taskId,comment,variables);
      variables.remove(FlowContants.PROCESS_EDITION);//不要升版了
      variables.remove(FlowVariableConstant.PROCESS_EDITION);//不要升版了
      taskService.complete(taskId, variables);
   }