From 0ef4cc755bddd87799b8bfdd65c8123df6e149d0 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期日, 17 八月 2025 23:52:51 +0800
Subject: [PATCH] 锁定流程完成
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/execute/TryFlowCompleteService.java | 21 ++++++++++++---------
1 files changed, 12 insertions(+), 9 deletions(-)
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/execute/TryFlowCompleteService.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/execute/TryFlowCompleteService.java
index e21b15d..1819d08 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/execute/TryFlowCompleteService.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/execute/TryFlowCompleteService.java
@@ -59,6 +59,7 @@
addApproveRecord(taskId,comment,variables);
//鍦ㄧ紪鍒朵换鍔℃椂锛屽垱寤鸿妭鐐癸紙娌℃湁鑺傜偣鍒欏垱寤猴紝鏈夊氨鐩存帴浣跨敤
+ /*
if(task.getTaskDefinitionKey().equals("programmingTask") && FlowContants.Y.equals(operateResult)) {
FlowProgramProperties progProperties = flowCommonService.getProgramProperties(processInstanceId);
ncNodeAutoCreateService.createNodeTreeWithProgram(progProperties);
@@ -71,26 +72,28 @@
curedProgramPackage.setIsLastEdition(0);
curedProgramPackage.setIsLocked(1);
ncNodeService.updateById(curedProgramPackage);
-
}
+ }*/
+ if(task.getTaskDefinitionKey().equals("approveTask") && FlowContants.Y.equals(operateResult)) {
+ //璇曞垏娴佺▼锛屾垨鑰� 鍋忕娴佺▼ 楂樺笀閫氳繃鐨勬椂鍊欏垱寤鸿妭鐐�
+ //createProgramNodes(processInstanceId);
}
variables.remove(FlowContants.PROCESS_EDITION);//涓嶈鍗囩増浜�
//if(!"confirmIsUseableTask".equals(task.getTaskDefinitionKey())){
if("confirmIsUseableTask".equals(task.getTaskDefinitionKey())){
//宸ュ簭鐗堟涓嶄竴鑷达紝骞朵笖瀹℃牳閫氳繃锛堝彲鐢級鏄紝鎵嶆洿鏂颁负鏂扮殑versionNumber
FlowProgramProperties progProperties = flowCommonService.getProgramProperties(processInstanceId);
+ variables.put(FlowContants.CURE_PROGRAM_USEABLE,operateResult);
- if(FlowContants.Y.equals(operateResult)) {
-
- if(FlowContants.N.equals(progProperties.getIsProcessEditionSame())) {
- //纭绋嬪簭鍙敤 涓� 宸ュ簭鐗堟涓嶄竴鑷达紝杩涘叆鏍″銆傝繖閲岄渶瑕佸崌绾х▼搴忕殑鐗堟湰鍙�
- Long curedNodeId = progProperties.getCuredNodeId();
- ncNodeService.upgradeVersionNumber(curedNodeId);
- }
-
+ if(FlowContants.Y.equals(operateResult) && FlowContants.N.equals(progProperties.getIsProcessEditionSame())) {
+ //纭绋嬪簭鍙敤 涓� 宸ュ簭鐗堟涓嶄竴鑷达紝杩涘叆鏍″銆傝繖閲岄渶瑕佸崌绾х▼搴忕殑鐗堟湰鍙�
+ Long curedNodeId = progProperties.getCuredNodeId();
+ ncNodeService.upgradeVersionNumber(curedNodeId);
}
}
taskService.complete(taskId, variables);
}
+
+
}
--
Gitblit v1.9.3