修改constant类名

yangys

2025-09-18 0d61b9bfca526e9c3da2209de8f9f367e76fd013

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

@@ -5,41 +5,23 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import lombok.AllArgsConstructor;
import org.flowable.engine.HistoryService;
import org.flowable.engine.RuntimeService;
import org.flowable.engine.history.HistoricProcessInstance;
import org.flowable.engine.history.HistoricProcessInstanceQuery;
import org.springblade.core.oss.OssTemplate;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.DateUtil;
import org.springblade.core.tool.utils.Func;
import org.springblade.mdm.basesetting.machine.entity.Machine;
import org.springblade.mdm.basesetting.machine.service.MachineService;
import org.springblade.mdm.basesetting.producedivision.entity.MdmDept;
import org.springblade.mdm.basesetting.producedivision.service.MdmDeptService;
import org.springblade.mdm.commons.contants.DictBizConstants;
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.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;
import org.springblade.mdm.flow.vo.FlowVO;
import org.springblade.mdm.statreport.utils.WordReplaceUtil;
import org.springblade.mdm.statreport.vo.NewProgrammingQueryVO;
import org.springblade.mdm.statreport.vo.NewProgrammingVO;
import org.springblade.system.feign.IDictBizClient;
import org.springblade.system.feign.IUserClient;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.InputStream;
import java.time.LocalDateTime;
import java.time.temporal.TemporalAdjusters;
import java.util.*;

@@ -60,10 +42,10 @@

   public IPage<NewProgrammingVO> pageQuery(NewProgrammingQueryVO queryVO) {
      //固化里路村官
      HistoricProcessInstanceQuery query = this.historyService.createHistoricProcessInstanceQuery().finished().processDefinitionKey(FlowContants.TRY_PROCESS_KEY).includeProcessVariables();
      HistoricProcessInstanceQuery query = this.historyService.createHistoricProcessInstanceQuery().finished().processDefinitionKey(FlowConstant.TRY_PROCESS_KEY).includeProcessVariables();
         //.finished() // 只查询已完成的流程.unfinished() // 查询未完成的流程
      query.variableNotExists(FlowVariableContants.EXCEPTION);//非异常流程
      query.variableValueEquals(FlowVariableContants.HAS_CURED_PROGRAM,FlowContants.N);//无固化程序
      query.variableNotExists(FlowVariableConstant.EXCEPTION);//非异常流程
      query.variableValueEquals(FlowVariableConstant.HAS_CURED_PROGRAM, FlowConstant.N);//无固化程序
      if(queryVO.getEndMonth()!=null){
         queryVO.setEndTimeBegin(queryVO.getEndMonth().withDayOfMonth(1));
         queryVO.setEndTimeEnd(queryVO.getEndMonth().with(TemporalAdjusters.lastDayOfMonth()));
@@ -98,13 +80,13 @@
         if(!machines.isEmpty()) {
            query.or();
            for(Machine machine : machines){
               query.variableValueEquals(FlowVariableContants.MACHINE_CODE, machine.getCode());
               query.variableValueEquals(FlowVariableConstant.MACHINE_CODE, machine.getCode());
            }

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