From e853c35455332a4652ec604c650ca82c411c864d Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期六, 13 九月 2025 15:24:46 +0800
Subject: [PATCH] 流程常量位置重构
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/statreport/service/ConfirmTablePrintService.java | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/statreport/service/ConfirmTablePrintService.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/statreport/service/ConfirmTablePrintService.java
index 2f2e08c..28751b9 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/statreport/service/ConfirmTablePrintService.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/statreport/service/ConfirmTablePrintService.java
@@ -19,6 +19,7 @@
import org.springblade.mdm.commons.contants.DictBizConstants;
import org.springblade.mdm.commons.service.ParamService;
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.ApproveInfoQueryService;
@@ -91,7 +92,7 @@
//闃叉鑰佹暟鎹姤閿�
dispatch = new TaskDispatch();
}
- dataMap.put("bh",node.getProgramNo());//缂栧彿锛屽氨鏄暟鎺х▼搴忕紪鍙�
+ dataMap.put("bh",props.getProgramNo());//缂栧彿锛屽氨鏄暟鎺х▼搴忕紪鍙�
dataMap.put("drawingNo", props.getDrawingNo());
dataMap.put("processNo", props.getProcessNo());
@@ -125,7 +126,7 @@
}else{
dataMap.put("czz", "");
}
- dataMap.put("programNo",dispatch.getProgramNo());
+ dataMap.put("programNo",props.getProgramNo());
if(StringUtils.isNotBlank(dispatch.getInspector())) {
dataMap.put("jyy",dispatch.getInspector()+"/"+formatTimeForTable(dispatch.getCheckTime()));//瀹為檯妫�楠屽憳鍜屾楠屾椂闂�
@@ -167,7 +168,7 @@
//鍥哄寲閲岃矾鏉戝畼
HistoricProcessInstanceQuery query = this.historyService.createHistoricProcessInstanceQuery().finished().processDefinitionKey(FlowContants.CURE_PROCESS_KEY).includeProcessVariables();
//.finished() // 鍙煡璇㈠凡瀹屾垚鐨勬祦绋�.unfinished() // 鏌ヨ鏈畬鎴愮殑娴佺▼
- query.variableNotExists(FlowContants.EXCEPTION);//闈炲紓甯告祦绋�
+ query.variableNotExists(FlowVariableContants.EXCEPTION);//闈炲紓甯告祦绋�
if(createTimeBegin!=null) {
query.startedAfter(DateUtil.toDate(createTimeBegin));
}
@@ -176,7 +177,7 @@
}
if(Func.isNotEmpty(drawingNo)) {
String likeVal = "%" + drawingNo + "%";
- query.variableValueLike(FlowContants.DRAWING_NO,likeVal);
+ query.variableValueLike(FlowVariableContants.DRAWING_NO,likeVal);
}
--
Gitblit v1.9.3