From 79e81a02076cdd1e828eb06029cd51eb37522f42 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期四, 18 九月 2025 09:11:37 +0800
Subject: [PATCH] 首页下载问题修复
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/statreport/service/NewProgrammingStatService.java | 11 ++++++-----
1 files changed, 6 insertions(+), 5 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 3b8f0b7..683efd0 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
@@ -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(); // 鎸夌粨鏉熸椂闂撮檷搴忔帓鍒�
@@ -129,7 +130,7 @@
}else{
vo.setActCheckerName(this.userCommonService.getUserNameById(props.getActCheckerId()) );
}
- if(props.getActCheckerId() == 0) {
+ if(props.getActSeniorId() == 0) {
vo.setActSeniorName(this.userCommonService.getUserNameById(props.getSeniorId()));
}else{
vo.setActSeniorName(this.userCommonService.getUserNameById(props.getActSeniorId()));
--
Gitblit v1.9.3