From a5f944c2bc0107e5df936937f1c33e5e03eb8fed Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期六, 06 九月 2025 19:15:48 +0800
Subject: [PATCH] 解锁增加解锁原因和展示
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/excution/StartDispatcher.java | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/excution/StartDispatcher.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/excution/StartDispatcher.java
index 690f9c3..a3b8bf8 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/excution/StartDispatcher.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/excution/StartDispatcher.java
@@ -80,14 +80,15 @@
NcNode curedProgramPackage = null;
if(!startVO.isTemporaryFlow() && !startVO.isDeviationFlow()) {
//姝ｅ父娴佺▼(闈炰复鏃舵祦绋�) 涓斾笉鏄� 鍋忕鍗�,鎵嶅尮閰嶅浐鍖栫▼搴�
- curedProgramPackage = ncNodeService.getCuredProgramPackage(programPkgName,startVO.getProcessEdition(), startVO.getMachineCode());
+ curedProgramPackage = ncNodeService.getLastCuredProgramPackageWithoutProcessEdition(programPkgName,startVO.getMachineCode());
//璁剧疆鏄惁鏈夊浐鍖栫▼搴忔爣璁�
vars.put(FlowContants.HAS_CURED_PROGRAM, curedProgramPackage != null ? FlowContants.Y : FlowContants.N);
//宸ュ簭鐗堟鏄惁涓�鑷达紝鏄惁鍦ㄦ湁鏁堟湡鍐�
- if (curedProgramPackage != null && Func.isBlank(startVO.getDeviation())) {//鍋忕鍗曚紭鍏堬紝濡傛灉鏈夊亸绂诲崟锛岄偅涔堟壘鍒板浐鍖栫▼搴忕殑涔熶笉绠楀浐鍖栦簡
+ if (curedProgramPackage != null) {
vars.put(FlowContants.CURED_NODE_ID, curedProgramPackage.getId());
vars.put(FlowContants.CURED_LOCKED, curedProgramPackage.hasLocked()?FlowContants.Y:FlowContants.N);
- vars.put(FlowContants.IS_PROCESS_EDITION_SAME, StringUtils.equals(curedProgramPackage.getProcessEdition(), startVO.getProcessEdition()) ? "Y" : "N");
+ vars.put(FlowContants.IS_PROCESS_EDITION_SAME, StringUtils.equals(curedProgramPackage.getProcessEdition(), startVO.getProcessEdition()) ? FlowContants.Y : FlowContants.N);
+ vars.put("curedProcessEdition", curedProgramPackage.getProcessEdition());
vars.put(FlowContants.VALIDITY_PERIOD, curedProgramPackage.withinValidityPeriod() ? FlowContants.Y : FlowContants.N);
} else {
vars.put(FlowContants.IS_PROCESS_EDITION_SAME, FlowContants.Y);
@@ -95,7 +96,7 @@
}
}else{
- //涓存椂娴佺▼/楠椾綘浣嗭紝涓嶅尮閰嶅浐鍖栫▼搴�
+ //涓存椂娴佺▼/鍋忕鍗曪紝涓嶅尮閰嶅浐鍖栫▼搴�
vars.put(FlowContants.HAS_CURED_PROGRAM,FlowContants.N);
}
String myProcessName = "璇曞垏涓嬪彂娴佺▼";
@@ -124,7 +125,6 @@
curedProgramPackage.setProcessInstanceId(inst.getProcessInstanceId());
ncNodeService.updateById(curedProgramPackage);
}
-
return inst.getProcessInstanceId();
}
--
Gitblit v1.9.3