流程常量位置重构

yangys

2025-09-13 e853c35455332a4652ec604c650ca82c411c864d

 blade-service/blade-mdm/src/main/java/org/springblade/mdm/statreport/service/NewProgrammingStatService.java

@@ -20,6 +20,7 @@
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.entity.FlowProgramFile;
import org.springblade.mdm.flow.entity.TaskDispatch;
import org.springblade.mdm.flow.service.FlowCommonService;
@@ -61,8 +62,8 @@
      //固化里路村官
      HistoricProcessInstanceQuery query = this.historyService.createHistoricProcessInstanceQuery().finished().processDefinitionKey(FlowContants.TRY_PROCESS_KEY).includeProcessVariables();
         //.finished() // 只查询已完成的流程.unfinished() // 查询未完成的流程
      query.variableNotExists(FlowContants.EXCEPTION);//非异常流程
      query.variableValueEquals(FlowContants.HAS_CURED_PROGRAM,FlowContants.N);//无固化程序
      query.variableNotExists(FlowVariableContants.EXCEPTION);//非异常流程
      query.variableValueEquals(FlowVariableContants.HAS_CURED_PROGRAM,FlowContants.N);//无固化程序
      if(queryVO.getEndMonth()!=null){
         queryVO.setEndTimeBegin(queryVO.getEndMonth().withDayOfMonth(1));
         queryVO.setEndTimeEnd(queryVO.getEndMonth().with(TemporalAdjusters.lastDayOfMonth()));
@@ -97,13 +98,13 @@
         if(!machines.isEmpty()) {
            query.or();
            for(Machine machine : machines){
               query.variableValueEquals(FlowContants.MACHINE_CODE, machine.getCode());
               query.variableValueEquals(FlowVariableContants.MACHINE_CODE, machine.getCode());
            }

            query.endOr();
         }else{
            //没找到机床，就应该查不到数据
            query.variableNotExists(FlowContants.MACHINE_CODE);
            query.variableNotExists(FlowVariableContants.MACHINE_CODE);
         }
      }
      query.orderByProcessInstanceEndTime().desc(); // 按结束时间降序排列