From 71a55d8d0d886eb6e489a7b581eb799f3a8ad054 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期三, 23 七月 2025 22:46:00 +0800
Subject: [PATCH] 增加流程列表中 “文件”列的显示方式

---
 blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/controller/DispatchController.java |   48 +++++++++++++++++++++++++++++++++++++++++-------
 1 files changed, 41 insertions(+), 7 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 9736baa..c07110f 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
@@ -1,18 +1,28 @@
 package org.springblade.mdm.flow.controller;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;
+import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
+import org.flowable.engine.RuntimeService;
 import org.flowable.engine.TaskService;
+import org.flowable.task.api.Task;
 import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.support.Kv;
+import org.springblade.core.tool.utils.DateUtil;
 import org.springblade.core.tool.utils.Func;
 import org.springblade.core.tool.utils.StringUtil;
+import org.springblade.mdm.flow.constants.FlowContants;
+import org.springblade.mdm.flow.entity.ApproveRecord;
 import org.springblade.mdm.flow.excution.StartDispatcher;
+import org.springblade.mdm.flow.service.ApproveRecordService;
+import org.springblade.mdm.flow.service.FlowCommonService;
 import org.springblade.mdm.flow.vo.TaskAssignVO;
+import org.springblade.mdm.program.entity.ProcessProgRef;
 import org.springblade.mdm.program.service.ProcessProgRefService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -20,20 +30,25 @@
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.ArrayList;
+import java.util.List;
 import java.util.Map;
 
 @Slf4j
 @RestController
+@AllArgsConstructor
 @RequestMapping("/flow/dispatch")
 @Tag(name = "娲惧伐娴佺▼", description = "娲惧伐娴佺▼")
 public class DispatchController {
 
-	@Autowired
-	private StartDispatcher dispatcher;
-	@Autowired
-	private TaskService taskService;
-	@Autowired
-	private ProcessProgRefService processProgRefService;
+	private final StartDispatcher dispatcher;
+
+	private final TaskService taskService;
+	private final RuntimeService runtimeService;
+	private final ProcessProgRefService processProgRefService;
+
+	private ApproveRecordService approveRecordService;
+	private final FlowCommonService flowCommonService;
 	/**
 	 * 鏂板
 	 */
@@ -46,7 +61,7 @@
 
 	@Operation(summary = "瀹屾垚浠诲姟", description = "娴佸悜涓嬩竴涓妭鐐�")
 	@PostMapping("completeTask")
-	public R<Void> completeTask(String taskId, String processInstanceId, String comment,@Parameter(description = "瀵瑰簲鐨勭▼搴廼d,閫楀彿鍒嗛殧") String programIds, @Parameter(name = "variables", description = "浠诲姟鍙橀噺") @RequestBody Map<String, Object> variables) {
+	public R<Void> completeTask(String taskId, String processInstanceId, String comment,@Parameter(name = "variables", description = "浠诲姟鍙橀噺") @RequestBody Map<String, Object> variables) {
 		// 澧炲姞璇勮
 		if (StringUtil.isNoneBlank(processInstanceId, comment)) {
 			taskService.addComment(taskId, processInstanceId, comment);
@@ -55,15 +70,24 @@
 		if (Func.isEmpty(variables)) {
 			variables = Kv.create();
 		}
+		String programIds = null;
+		if(variables.containsKey(FlowContants.PROGRAM_IDS_KEY)){
+			programIds = variables.get("programIds").toString();
+			runtimeService.setVariable(taskId, FlowContants.PROGRAM_IDS_KEY, programIds);
+		}
 		if(StringUtils.isNotEmpty(programIds)) {
 			processProgRefService.addRelations(processInstanceId,Func.toLongList(programIds));
 		}
 
 		//鍔犲叆瀹℃壒鐢ㄦ埛
 		variables.put("approveUserNickName",AuthUtil.getNickName());
+
 		if(variables.containsKey("assignee")){
+
+			addApproveRecord(taskId,processInstanceId,comment,variables);
 			//鎸囧畾浜嗕笅涓�姝ユ墽琛屼汉
 			taskService.complete(taskId, variables);
+
 			return R.success("娴佺▼鎻愪氦鎴愬姛");
 		}else {
 			// 瀹屾垚浠诲姟,缁欓粯璁ょ敤鎴�
@@ -71,4 +95,14 @@
 		}
 
 	}
+
+	void addApproveRecord(String taskId, String processInstanceId, String comment,Map<String, Object> variables){
+		String operateResult = variables.get("approve")+"";
+
+		Task task = taskService.createTaskQuery()
+			.taskId(taskId)
+			.singleResult();
+		approveRecordService.saveApproveRecords(task,processInstanceId,operateResult,comment);
+
+	}
 }

--
Gitblit v1.9.3