流程常量位置重构

yangys

2025-09-13 e853c35455332a4652ec604c650ca82c411c864d

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

@@ -19,12 +19,11 @@
import org.springblade.core.tool.utils.*;

import org.springblade.mdm.flow.constants.FlowContants;
import org.springblade.mdm.flow.constants.FlowVariableContants;
import org.springblade.mdm.flow.entity.FlowProgramFile;
import org.springblade.mdm.flow.entity.MdmFlowProcess;
import org.springblade.mdm.flow.util.MdmFlowCache;
import org.springblade.mdm.flow.vo.FlowVO;
import org.springblade.mdm.program.service.NcProgramService;
import org.springblade.mdm.program.service.ProcessProgRefService;
import org.springblade.system.feign.IUserClient;
import org.springblade.system.pojo.entity.User;
import org.springframework.stereotype.Service;
@@ -36,7 +35,7 @@
/**
 * 流程业务实现类
 *
 * @author Chill
 * @author yangys
 */
@Service
@AllArgsConstructor
@@ -92,13 +91,13 @@
      if(Func.isNotEmpty(keyword)) {
         String likeVal = "%" + keyword + "%";
         todoQuery.or();
         todoQuery.processVariableValueLike(FlowContants.TITLE,likeVal);
         todoQuery.processVariableValueLike(FlowContants.PROCESS_NO, likeVal);
         todoQuery.processVariableValueLike(FlowContants.MACHINE_CODE, likeVal);
         todoQuery.processVariableValueLike(FlowContants.MACHINE_MODE, likeVal);
         todoQuery.processVariableValueLike(FlowContants.PROCESS_NAME, likeVal);
         todoQuery.processVariableValueLike(FlowContants.PROCESS_EDITION, likeVal);
         todoQuery.processVariableValueLike(FlowContants.CRAFT_EDITION, likeVal);
         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.processDefinitionNameLike(likeVal);
         todoQuery.endOr();
@@ -289,7 +288,7 @@
         taskQuery.taskCreatedBefore(DateUtil.toDate(createTimeEnd.plusDays(1)));
      }
      if(Func.isNotEmpty(myProcessName)) {
         taskQuery.processVariableValueEquals(FlowContants.MY_PROCESS_NAME, myProcessName);
         taskQuery.processVariableValueEquals(FlowVariableContants.MY_PROCESS_NAME, myProcessName);
      }

      addKeywordCondition(taskQuery, keyword);
@@ -326,7 +325,7 @@
      HistoricProcessInstanceQuery query = this.historyService.createHistoricProcessInstanceQuery().finished().includeProcessVariables();
         //.finished() // 只查询已完成的流程.unfinished() // 查询未完成的流程
      if(Func.isNotEmpty(myProcessName)) {
         query.variableValueEquals(FlowContants.MY_PROCESS_NAME, myProcessName);
         query.variableValueEquals(FlowVariableContants.MY_PROCESS_NAME, myProcessName);
      }
      if(createTimeBegin!=null) {
         query.startedAfter(DateUtil.toDate(createTimeBegin));
@@ -337,13 +336,13 @@
      if(Func.isNotEmpty(keyword)) {
         String likeVal = "%" + keyword + "%";
         query.or();
         query.variableValueLike(FlowContants.TITLE,likeVal);
         query.variableValueLike(FlowContants.PROCESS_NO, likeVal);
         query.variableValueLike(FlowContants.MACHINE_CODE, likeVal);
         query.variableValueLike(FlowContants.MACHINE_MODE, likeVal);
         query.variableValueLike(FlowContants.PROCESS_NAME, likeVal);
         query.variableValueLike(FlowContants.PROCESS_EDITION, likeVal);
         query.variableValueLike(FlowContants.CRAFT_EDITION, likeVal);
         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.endOr();
      }
@@ -395,9 +394,9 @@
      HistoricProcessInstanceQuery query = this.historyService.createHistoricProcessInstanceQuery().finished().includeProcessVariables();
      //.finished() // 只查询已完成的流程.unfinished() // 查询未完成的流程

      query.variableValueEquals(FlowContants.EXCEPTION, "1");
      query.variableValueEquals(FlowVariableContants.EXCEPTION, "1");
      if(Func.isNotEmpty(myProcessName)) {
         query.variableValueEquals(FlowContants.MY_PROCESS_NAME, myProcessName);
         query.variableValueEquals(FlowVariableContants.MY_PROCESS_NAME, myProcessName);
      }
      if(createTimeBegin!=null) {
         query.startedAfter(DateUtil.toDate(createTimeBegin));
@@ -408,13 +407,13 @@
      if(Func.isNotEmpty(keyword)) {
         String likeVal = "%" + keyword + "%";
         query.or();
         query.variableValueLike(FlowContants.TITLE,likeVal);
         query.variableValueLike(FlowContants.PROCESS_NO, likeVal);
         query.variableValueLike(FlowContants.MACHINE_CODE, likeVal);
         query.variableValueLike(FlowContants.MACHINE_MODE, likeVal);
         query.variableValueLike(FlowContants.PROCESS_NAME, likeVal);
         query.variableValueLike(FlowContants.PROCESS_EDITION, likeVal);
         query.variableValueLike(FlowContants.CRAFT_EDITION, likeVal);
         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.endOr();
      }