From 0d61b9bfca526e9c3da2209de8f9f367e76fd013 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期四, 18 九月 2025 18:09:35 +0800
Subject: [PATCH] 修改constant类名
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/statreport/service/CuredProgramStatService.java | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/statreport/service/CuredProgramStatService.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/statreport/service/CuredProgramStatService.java
index 2bd91f2..4575fe5 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/statreport/service/CuredProgramStatService.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/statreport/service/CuredProgramStatService.java
@@ -13,7 +13,8 @@
import org.springblade.mdm.basesetting.producedivision.entity.MdmDept;
import org.springblade.mdm.basesetting.producedivision.service.MdmDeptService;
import org.springblade.mdm.commons.service.UserCommonService;
-import org.springblade.mdm.flow.constants.FlowContants;
+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.FlowProgramProperties;
import org.springblade.mdm.statreport.vo.CuredProgramQueryVO;
@@ -44,9 +45,9 @@
public IPage<CuredProgramVO> pageQuery(CuredProgramQueryVO queryVO) {
//鍥哄寲閲岃矾鏉戝畼
- HistoricProcessInstanceQuery query = this.historyService.createHistoricProcessInstanceQuery().finished().processDefinitionKey(FlowContants.CURE_PROCESS_KEY).includeProcessVariables();
+ HistoricProcessInstanceQuery query = this.historyService.createHistoricProcessInstanceQuery().finished().processDefinitionKey(FlowConstant.CURE_PROCESS_KEY).includeProcessVariables();
//.finished() // 鍙煡璇㈠凡瀹屾垚鐨勬祦绋�.unfinished() // 鏌ヨ鏈畬鎴愮殑娴佺▼
- query.variableNotExists(FlowContants.EXCEPTION);//闈炲紓甯告祦绋�
+ query.variableNotExists(FlowVariableConstant.EXCEPTION);//闈炲紓甯告祦绋�
if(queryVO.getEndMonth()!=null){
queryVO.setEndTimeBegin(queryVO.getEndMonth().withDayOfMonth(1));
queryVO.setEndTimeEnd(queryVO.getEndMonth().with(TemporalAdjusters.lastDayOfMonth()));
@@ -81,13 +82,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