修改constant类名

yangys

2025-09-18 0d61b9bfca526e9c3da2209de8f9f367e76fd013

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

@@ -4,7 +4,6 @@
import org.flowable.task.api.Task;
import org.springblade.core.log.exception.ServiceException;
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.support.Kv;
import org.springblade.core.tool.utils.Func;
import org.springblade.core.tool.utils.StringUtil;
@@ -12,8 +11,8 @@
import org.springblade.mdm.basesetting.machine.service.MachineService;
import org.springblade.mdm.commons.service.ParamService;
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.constants.FlowConstant;
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;
@@ -44,6 +43,11 @@
   @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);

      FlowProgramProperties props = flowCommonService.getProgramProperties(processInstanceId);
@@ -51,44 +55,38 @@
         throw new ServiceException("请指定流程下一步处理人");
      }

      // 非空判断
      if (Func.isEmpty(variables)) {
         variables = Kv.create();
      }

      if(task.getTaskDefinitionKey().equals("programmingTask") ) {//编制节点
         //记录实际编程员
         variables.put(FlowVariableContants.ACT_PROGRAMMER,Func.toStr(AuthUtil.getUserId()));
         String programOnMachine = Func.toStr(variables.getOrDefault("programOnMachine",FlowContants.N));//是否现场编程
         if(this.needUploadProgramFile(props.getMachineCode()) && programOnMachine.equals(FlowContants.N)) {
            flowProgramFileService.checkProgramFiles(processInstanceId, FlowContants.Y.equals(operateResult));
         variables.put(FlowVariableConstant.ACT_PROGRAMMER,Func.toStr(AuthUtil.getUserId()));

         String programOnMachine = Func.toStr(variables.getOrDefault(FlowVariableConstant.PROGRAM_ON_MACHINE, FlowConstant.N));//是否现场编程
         if(this.needUploadProgramFile(props.getMachineCode()) && programOnMachine.equals(FlowConstant.N)) {
            flowProgramFileService.checkProgramFiles(processInstanceId, FlowConstant.Y.equals(operateResult));
         }
      }else if(task.getTaskDefinitionKey().equals("teamLeaderTask")){
         if(FlowContants.Y.equals(operateResult)) {
            runtimeService.setVariable(task.getExecutionId(),FlowContants.PROGRAMMER_NAME,userCommonService.getUserNameById(Func.toLong(variables.get("assignee"))));
         if(FlowConstant.Y.equals(operateResult)) {
            runtimeService.setVariable(task.getExecutionId(), FlowConstant.PROGRAMMER_NAME,userCommonService.getUserNameById(Func.toLong(variables.get("assignee"))));
         }
      }else if(task.getTaskDefinitionKey().equals("check")){
         runtimeService.setVariable(task.getExecutionId(),FlowVariableContants.ACT_CHECKER,Func.toLong(variables.get("assignee")));
         variables.put(FlowVariableConstant.ACT_CHECKER,Func.toStr(AuthUtil.getUserId()));
      }else if(task.getTaskDefinitionKey().equals("approveTask")){
         runtimeService.setVariable(task.getExecutionId(),FlowVariableContants.ACT_SENIOR,Func.toLong(variables.get("assignee")));
         variables.put(FlowVariableConstant.ACT_SENIOR,Func.toStr(AuthUtil.getUserId()));
      }
      variables.remove("programOnMachine");//其他节点，忽略现场编程标记
      variables.remove(FlowVariableConstant.PROGRAM_ON_MACHINE);//其他节点，忽略现场编程标记
      if (StringUtil.isNoneBlank(processInstanceId, comment)) {
         taskService.addComment(taskId, processInstanceId, comment);
      }

      variables.put(FlowContants.LAST_STEP_USER_NICKNAME, AuthUtil.getNickName());
      variables.put(FlowVariableConstant.LAST_STEP_USER_NICKNAME, AuthUtil.getNickName());

      addApproveRecord(taskId,comment,variables);

      variables.remove(FlowContants.PROCESS_EDITION);//不要升版了
      variables.remove(FlowVariableConstant.PROCESS_EDITION);//不要升版了

      if("confirmIsUseableTask".equals(task.getTaskDefinitionKey())){
         variables.put(FlowContants.CURE_PROGRAM_USEABLE,operateResult);
         variables.put(FlowConstant.CURE_PROGRAM_USEABLE,operateResult);

         if(FlowContants.Y.equals(operateResult)) {
         if(FlowConstant.Y.equals(operateResult)) {
            //判定可用，记录为实际编程员
            variables.put(FlowVariableContants.ACT_PROGRAMMER,Func.toStr(AuthUtil.getUserId()));
            variables.put(FlowVariableConstant.ACT_PROGRAMMER,Func.toStr(AuthUtil.getUserId()));
         }
      }
      taskService.complete(taskId, variables);