修改constant类名

yangys

2025-09-18 0d61b9bfca526e9c3da2209de8f9f367e76fd013

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

@@ -21,8 +21,7 @@
import org.springblade.mdm.basesetting.machine.entity.Machine;
import org.springblade.mdm.basesetting.machine.service.MachineService;
import org.springblade.mdm.commons.service.ParamService;
import org.springblade.mdm.flow.constants.FlowContants;
import org.springblade.mdm.flow.constants.FlowVariableContants;
import org.springblade.mdm.flow.constants.FlowVariableConstant;
import org.springblade.mdm.flow.entity.FlowProgramFile;
import org.springblade.mdm.flow.entity.MdmFlowProcess;
import org.springblade.mdm.flow.util.MdmFlowCache;
@@ -78,14 +77,14 @@
               //车床
               todoQuery.or();
               for (String mCode : turnMachineCodes) {
                  todoQuery.processVariableValueEquals(FlowVariableContants.MACHINE_CODE, mCode);
                  todoQuery.processVariableValueEquals(FlowVariableConstant.MACHINE_CODE, mCode);
               }
               todoQuery.endOr();
            } else {
               //加工中心
               todoQuery.or();
               for (String mCode : turnMachineCodes) {
                  todoQuery.processVariableValueNotEquals(FlowVariableContants.MACHINE_CODE, mCode);
                  todoQuery.processVariableValueNotEquals(FlowVariableConstant.MACHINE_CODE, mCode);
               }
               todoQuery.endOr();
            }
@@ -123,13 +122,13 @@
      if(Func.isNotEmpty(keyword)) {
         String likeVal = "%" + keyword + "%";
         todoQuery.or();
         todoQuery.processVariableValueLike(FlowVariableContants.TITLE,likeVal);
         todoQuery.processVariableValueLike(FlowVariableContants.PROCESS_NO, likeVal);
         todoQuery.processVariableValueLike(FlowVariableContants.MACHINE_CODE, likeVal);
         todoQuery.processVariableValueLike(FlowVariableContants.MACHINE_MODE, likeVal);
         todoQuery.processVariableValueLike(FlowVariableContants.PROCESS_NAME, likeVal);
         todoQuery.processVariableValueLike(FlowVariableContants.PROCESS_EDITION, likeVal);
         todoQuery.processVariableValueLike(FlowVariableContants.CRAFT_EDITION, likeVal);
         todoQuery.processVariableValueLike(FlowVariableConstant.TITLE,likeVal);
         todoQuery.processVariableValueLike(FlowVariableConstant.PROCESS_NO, likeVal);
         todoQuery.processVariableValueLike(FlowVariableConstant.MACHINE_CODE, likeVal);
         todoQuery.processVariableValueLike(FlowVariableConstant.MACHINE_MODE, likeVal);
         todoQuery.processVariableValueLike(FlowVariableConstant.PROCESS_NAME, likeVal);
         todoQuery.processVariableValueLike(FlowVariableConstant.PROCESS_EDITION, likeVal);
         todoQuery.processVariableValueLike(FlowVariableConstant.CRAFT_EDITION, likeVal);

         todoQuery.processDefinitionNameLike(likeVal);
         todoQuery.endOr();
@@ -320,7 +319,7 @@
         taskQuery.taskCreatedBefore(DateUtil.toDate(createTimeEnd.plusDays(1)));
      }
      if(Func.isNotEmpty(myProcessName)) {
         taskQuery.processVariableValueEquals(FlowVariableContants.MY_PROCESS_NAME, myProcessName);
         taskQuery.processVariableValueEquals(FlowVariableConstant.MY_PROCESS_NAME, myProcessName);
      }

      addKeywordCondition(taskQuery, keyword);
@@ -357,7 +356,7 @@
      HistoricProcessInstanceQuery query = this.historyService.createHistoricProcessInstanceQuery().finished().includeProcessVariables();
         //.finished() // 只查询已完成的流程.unfinished() // 查询未完成的流程
      if(Func.isNotEmpty(myProcessName)) {
         query.variableValueEquals(FlowVariableContants.MY_PROCESS_NAME, myProcessName);
         query.variableValueEquals(FlowVariableConstant.MY_PROCESS_NAME, myProcessName);
      }
      if(createTimeBegin!=null) {
         query.startedAfter(DateUtil.toDate(createTimeBegin));
@@ -368,13 +367,13 @@
      if(Func.isNotEmpty(keyword)) {
         String likeVal = "%" + keyword + "%";
         query.or();
         query.variableValueLike(FlowVariableContants.TITLE,likeVal);
         query.variableValueLike(FlowVariableContants.PROCESS_NO, likeVal);
         query.variableValueLike(FlowVariableContants.MACHINE_CODE, likeVal);
         query.variableValueLike(FlowVariableContants.MACHINE_MODE, likeVal);
         query.variableValueLike(FlowVariableContants.PROCESS_NAME, likeVal);
         query.variableValueLike(FlowVariableContants.PROCESS_EDITION, likeVal);
         query.variableValueLike(FlowVariableContants.CRAFT_EDITION, likeVal);
         query.variableValueLike(FlowVariableConstant.TITLE,likeVal);
         query.variableValueLike(FlowVariableConstant.PROCESS_NO, likeVal);
         query.variableValueLike(FlowVariableConstant.MACHINE_CODE, likeVal);
         query.variableValueLike(FlowVariableConstant.MACHINE_MODE, likeVal);
         query.variableValueLike(FlowVariableConstant.PROCESS_NAME, likeVal);
         query.variableValueLike(FlowVariableConstant.PROCESS_EDITION, likeVal);
         query.variableValueLike(FlowVariableConstant.CRAFT_EDITION, likeVal);

         query.endOr();
      }
@@ -426,9 +425,9 @@
      HistoricProcessInstanceQuery query = this.historyService.createHistoricProcessInstanceQuery().finished().includeProcessVariables();
      //.finished() // 只查询已完成的流程.unfinished() // 查询未完成的流程

      query.variableValueEquals(FlowVariableContants.EXCEPTION, "1");
      query.variableValueEquals(FlowVariableConstant.EXCEPTION, "1");
      if(Func.isNotEmpty(myProcessName)) {
         query.variableValueEquals(FlowVariableContants.MY_PROCESS_NAME, myProcessName);
         query.variableValueEquals(FlowVariableConstant.MY_PROCESS_NAME, myProcessName);
      }
      if(createTimeBegin!=null) {
         query.startedAfter(DateUtil.toDate(createTimeBegin));
@@ -439,13 +438,13 @@
      if(Func.isNotEmpty(keyword)) {
         String likeVal = "%" + keyword + "%";
         query.or();
         query.variableValueLike(FlowVariableContants.TITLE,likeVal);
         query.variableValueLike(FlowVariableContants.PROCESS_NO, likeVal);
         query.variableValueLike(FlowVariableContants.MACHINE_CODE, likeVal);
         query.variableValueLike(FlowVariableContants.MACHINE_MODE, likeVal);
         query.variableValueLike(FlowVariableContants.PROCESS_NAME, likeVal);
         query.variableValueLike(FlowVariableContants.PROCESS_EDITION, likeVal);
         query.variableValueLike(FlowVariableContants.CRAFT_EDITION, likeVal);
         query.variableValueLike(FlowVariableConstant.TITLE,likeVal);
         query.variableValueLike(FlowVariableConstant.PROCESS_NO, likeVal);
         query.variableValueLike(FlowVariableConstant.MACHINE_CODE, likeVal);
         query.variableValueLike(FlowVariableConstant.MACHINE_MODE, likeVal);
         query.variableValueLike(FlowVariableConstant.PROCESS_NAME, likeVal);
         query.variableValueLike(FlowVariableConstant.PROCESS_EDITION, likeVal);
         query.variableValueLike(FlowVariableConstant.CRAFT_EDITION, likeVal);

         query.endOr();
      }