From 5f0956f6a5bf753d8e0c0e6a7c530c65af1edf82 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期一, 30 六月 2025 20:16:57 +0800
Subject: [PATCH] 流程与程序关联表插入数据

---
 blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/controller/DispatchController.java |   11 +++++++++--
 1 files changed, 9 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 582170f..9736baa 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
@@ -4,6 +4,7 @@
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.flowable.engine.TaskService;
 import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.api.R;
@@ -12,6 +13,7 @@
 import org.springblade.core.tool.utils.StringUtil;
 import org.springblade.mdm.flow.excution.StartDispatcher;
 import org.springblade.mdm.flow.vo.TaskAssignVO;
+import org.springblade.mdm.program.service.ProcessProgRefService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -30,7 +32,8 @@
 	private StartDispatcher dispatcher;
 	@Autowired
 	private TaskService taskService;
-
+	@Autowired
+	private ProcessProgRefService processProgRefService;
 	/**
 	 * 鏂板
 	 */
@@ -43,7 +46,7 @@
 
 	@Operation(summary = "瀹屾垚浠诲姟", description = "娴佸悜涓嬩竴涓妭鐐�")
 	@PostMapping("completeTask")
-	public R<Void> completeTask(String taskId, String processInstanceId, String comment, @Parameter(name = "variables", description = "浠诲姟鍙橀噺") @RequestBody Map<String, Object> variables) {
+	public R<Void> completeTask(String taskId, String processInstanceId, String comment,@Parameter(description = "瀵瑰簲鐨勭▼搴廼d,閫楀彿鍒嗛殧") String programIds, @Parameter(name = "variables", description = "浠诲姟鍙橀噺") @RequestBody Map<String, Object> variables) {
 		// 澧炲姞璇勮
 		if (StringUtil.isNoneBlank(processInstanceId, comment)) {
 			taskService.addComment(taskId, processInstanceId, comment);
@@ -52,6 +55,10 @@
 		if (Func.isEmpty(variables)) {
 			variables = Kv.create();
 		}
+		if(StringUtils.isNotEmpty(programIds)) {
+			processProgRefService.addRelations(processInstanceId,Func.toLongList(programIds));
+		}
+
 		//鍔犲叆瀹℃壒鐢ㄦ埛
 		variables.put("approveUserNickName",AuthUtil.getNickName());
 		if(variables.containsKey("assignee")){

--
Gitblit v1.9.3