From 270aceade15ec4cb7715131055b53cec4ecb7d4e Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期五, 19 九月 2025 18:13:21 +0800
Subject: [PATCH] 增加现场编制查询列表
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/statreport/service/NewProgrammingStatService.java | 31 +++++++------------------------
1 files changed, 7 insertions(+), 24 deletions(-)
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/statreport/service/NewProgrammingStatService.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/statreport/service/NewProgrammingStatService.java
index e79bedc..d723157 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/statreport/service/NewProgrammingStatService.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/statreport/service/NewProgrammingStatService.java
@@ -5,40 +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.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.*;
@@ -59,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(FlowContants.EXCEPTION);//闈炲紓甯告祦绋�
- query.variableValueEquals(FlowContants.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()));
@@ -97,13 +80,13 @@
if(!machines.isEmpty()) {
query.or();
for(Machine machine : machines){
- query.variableValueEquals(FlowContants.MACHINE_CODE, machine.getCode());
+ query.variableValueEquals(FlowVariableConstant.MACHINE_CODE, machine.getCode());
}
query.endOr();
}else{
//娌℃壘鍒版満搴婏紝灏卞簲璇ユ煡涓嶅埌鏁版嵁
- query.variableNotExists(FlowContants.MACHINE_CODE);
+ query.variableNotExists(FlowVariableConstant.MACHINE_CODE);
}
}
query.orderByProcessInstanceEndTime().desc(); // 鎸夌粨鏉熸椂闂撮檷搴忔帓鍒�
--
Gitblit v1.9.3