From 88748094ae17ca3b6423c54d307f0d5c40c8f420 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期六, 02 八月 2025 14:44:13 +0800
Subject: [PATCH] 增加文件完整性校验

---
 blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/controller/DispatchController.java |   41 +++++++++++++++++++++++++++--------------
 1 files changed, 27 insertions(+), 14 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 ab823cd..090b3b1 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,8 +4,10 @@
 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;
@@ -14,9 +16,12 @@
 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.service.FlowProgramFileService;
 import org.springblade.mdm.flow.vo.TaskAssignVO;
 import org.springblade.mdm.program.entity.ProcessProgRef;
 import org.springblade.mdm.program.service.ProcessProgRefService;
@@ -32,21 +37,23 @@
 
 @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;
 
-	@Autowired
-	private ApproveRecordService approveRecordService;
+	private final TaskService taskService;
+	private final RuntimeService runtimeService;
+	private final ProcessProgRefService processProgRefService;
+
+	private final ApproveRecordService approveRecordService;
+	private final FlowCommonService flowCommonService;
+
+	private final FlowProgramFileService flowProgramFileService;
 	/**
-	 * 鏂板
+	 * 鍙戣捣娲惧伐娴佺▼
 	 */
 	@PostMapping("/start")
 	@Operation(summary = "浠诲姟璁″垝(娲惧伐娴佺▼)", description = "鍚姩娲惧伐娴佺▼")
@@ -58,6 +65,14 @@
 	@Operation(summary = "瀹屾垚浠诲姟", description = "娴佸悜涓嬩竴涓妭鐐�")
 	@PostMapping("completeTask")
 	public R<Void> completeTask(String taskId, String processInstanceId, String comment,@Parameter(name = "variables", description = "浠诲姟鍙橀噺") @RequestBody Map<String, Object> variables) {
+
+		Task task = taskService.createTaskQuery()
+			.taskId(taskId)
+			.singleResult();
+		if(task.getTaskDefinitionKey().equals("programmingTask")) {//缂栧埗鑺傜偣
+			String operateResult = variables.get("approve")+"";
+			flowProgramFileService.checkProgramFiles(processInstanceId,"Y".equals(operateResult));
+		}
 		// 澧炲姞璇勮
 		if (StringUtil.isNoneBlank(processInstanceId, comment)) {
 			taskService.addComment(taskId, processInstanceId, comment);
@@ -67,10 +82,12 @@
 			variables = Kv.create();
 		}
 		String programIds = null;
-		if(variables.containsKey("programIds")){
+		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));
 		}
 
@@ -78,7 +95,6 @@
 		variables.put("approveUserNickName",AuthUtil.getNickName());
 
 		if(variables.containsKey("assignee")){
-
 			addApproveRecord(taskId,processInstanceId,comment,variables);
 			//鎸囧畾浜嗕笅涓�姝ユ墽琛屼汉
 			taskService.complete(taskId, variables);
@@ -98,9 +114,6 @@
 			.taskId(taskId)
 			.singleResult();
 		approveRecordService.saveApproveRecords(task,processInstanceId,operateResult,comment);
-		List<Long> programIdList = new ArrayList<>();
-
-
 
 	}
 }

--
Gitblit v1.9.3