From 96481362fed4eab7b96cc9016ece1917b43bbcc5 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期一, 04 八月 2025 14:54:38 +0800
Subject: [PATCH] dnc导出，增加写入下发目录的代码
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/controller/DispatchController.java | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/controller/DispatchController.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/controller/DispatchController.java
index 090b3b1..81ed709 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/controller/DispatchController.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/controller/DispatchController.java
@@ -24,6 +24,7 @@
import org.springblade.mdm.flow.service.FlowProgramFileService;
import org.springblade.mdm.flow.vo.TaskAssignVO;
import org.springblade.mdm.program.entity.ProcessProgRef;
+import org.springblade.mdm.program.service.NcNodeAutoCreateService;
import org.springblade.mdm.program.service.ProcessProgRefService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping;
@@ -52,6 +53,8 @@
private final FlowCommonService flowCommonService;
private final FlowProgramFileService flowProgramFileService;
+
+ private final NcNodeAutoCreateService ncNodeAutoCreateService;
/**
* 鍙戣捣娲惧伐娴佺▼
*/
@@ -69,8 +72,8 @@
Task task = taskService.createTaskQuery()
.taskId(taskId)
.singleResult();
+ String operateResult = variables.get("approve")+"";
if(task.getTaskDefinitionKey().equals("programmingTask")) {//缂栧埗鑺傜偣
- String operateResult = variables.get("approve")+"";
flowProgramFileService.checkProgramFiles(processInstanceId,"Y".equals(operateResult));
}
// 澧炲姞璇勮
@@ -81,6 +84,7 @@
if (Func.isEmpty(variables)) {
variables = Kv.create();
}
+ /*
String programIds = null;
if(variables.containsKey(FlowContants.PROGRAM_IDS_KEY)){
programIds = variables.get("programIds").toString();
@@ -90,6 +94,7 @@
//杩欏凡缁忔病鐢ㄤ簡锛岀洿鎺ヤ娇鐢ㄤ复鏃舵枃浠�
processProgRefService.addRelations(processInstanceId,Func.toLongList(programIds));
}
+ */
//鍔犲叆瀹℃壒鐢ㄦ埛
variables.put("approveUserNickName",AuthUtil.getNickName());
@@ -98,7 +103,10 @@
addApproveRecord(taskId,processInstanceId,comment,variables);
//鎸囧畾浜嗕笅涓�姝ユ墽琛屼汉
taskService.complete(taskId, variables);
-
+ //鍦ㄧ紪鍒朵换鍔℃椂锛屽垱寤鸿妭鐐癸紙娌℃湁鑺傜偣鍒欏垱寤猴紝鏈夊氨鐩存帴浣跨敤
+ if(task.getTaskDefinitionKey().equals("programmingTask") && "Y".equals(operateResult)) {
+ ncNodeAutoCreateService.createNodeTree(processInstanceId);
+ }
return R.success("娴佺▼鎻愪氦鎴愬姛");
}else {
// 瀹屾垚浠诲姟,缁欓粯璁ょ敤鎴�
--
Gitblit v1.9.3