From 9bc9760ef1d80c49a76b3abe16cb1408e5d185b7 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期五, 08 八月 2025 11:46:57 +0800
Subject: [PATCH] 替换流程基本实现

---
 blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/controller/DispatchController.java |  119 ++++++++++++++++++++++++++++++++++++++++-------------------
 1 files changed, 81 insertions(+), 38 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 f464779..8a7d871 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,11 +1,15 @@
 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.engine.runtime.ProcessInstance;
 import org.flowable.task.api.Task;
 import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.api.R;
@@ -13,10 +17,19 @@
 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.service.TaskDispatchService;
+import org.springblade.mdm.flow.service.execute.AbstractFlowCompleteService;
+import org.springblade.mdm.flow.service.execute.DefaultFlowCompleteService;
+import org.springblade.mdm.flow.service.execute.TryFlowCompleteService;
 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;
@@ -30,32 +43,67 @@
 
 @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 FlowProgramFileService flowProgramFileService;
+
+
+	private final TryFlowCompleteService tryFlowCompleteService;
+	private final DefaultFlowCompleteService defaultFlowCompleteService;
+	private final TaskDispatchService taskDispatchService;
 	/**
-	 * 鏂板
+	 * 鍙戣捣娲惧伐娴佺▼
 	 */
 	@PostMapping("/start")
 	@Operation(summary = "浠诲姟璁″垝(娲惧伐娴佺▼)", description = "鍚姩娲惧伐娴佺▼")
 	public R<Boolean> start(@RequestBody TaskAssignVO startVO) {
-		dispatcher.start(startVO);
-		return R.status(true);
+		try {
+			long id= taskDispatchService.saveTask(startVO);
+			String instId = dispatcher.start(startVO);
+			taskDispatchService.updateSuccess(id,instId);
+			return R.data(true);
+		}catch(Exception e){
+			return R.fail(e.getMessage());
+		}
+
 	}
 
+	AbstractFlowCompleteService getActualService(String processInstanceId){
+		ProcessInstance inst = runtimeService.createProcessInstanceQuery().processInstanceId(processInstanceId).singleResult();
+		if(inst.getProcessDefinitionKey().equals(FlowContants.TRY_PROCESS_KEY) || inst.getProcessDefinitionKey().equals(FlowContants.CURE_PROCESS_KEY)){
+			return tryFlowCompleteService;
+		}else{
+			return defaultFlowCompleteService;
+		}
+	}
 	@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) {
+		try {
+			AbstractFlowCompleteService completeService = getActualService(processInstanceId);
+			completeService.completeTask(taskId, processInstanceId, comment, variables);
+			return R.success("娴佺▼鎻愪氦鎴愬姛");
+		}catch(Exception e){
+			return R.fail(e.getMessage());
+		}
+		/*
+		Task task = taskService.createTaskQuery()
+			.taskId(taskId)
+			.singleResult();
+		String operateResult = variables.get("approve")+"";
+		if(task.getTaskDefinitionKey().equals("programmingTask")) {//缂栧埗鑺傜偣
+			flowProgramFileService.checkProgramFiles(processInstanceId,"Y".equals(operateResult));
+		}
 		// 澧炲姞璇勮
 		if (StringUtil.isNoneBlank(processInstanceId, comment)) {
 			taskService.addComment(taskId, processInstanceId, comment);
@@ -64,15 +112,25 @@
 		if (Func.isEmpty(variables)) {
 			variables = Kv.create();
 		}
-		if(StringUtils.isNotEmpty(programIds)) {
-			processProgRefService.addRelations(processInstanceId,Func.toLongList(programIds));
-		}
 
 		//鍔犲叆瀹℃壒鐢ㄦ埛
-		variables.put("approveUserNickName",AuthUtil.getNickName());
+		variables.put(FlowContants.LAST_STEP_USER_NICKNAME,AuthUtil.getNickName());
 
 		if(variables.containsKey("assignee")){
-			addApproveRecord(taskId,processInstanceId,comment,programIds,variables);
+			addApproveRecord(taskId,comment,variables);
+
+			//鍦ㄧ紪鍒朵换鍔℃椂锛屽垱寤鸿妭鐐癸紙娌℃湁鑺傜偣鍒欏垱寤猴紝鏈夊氨鐩存帴浣跨敤
+			if(task.getTaskDefinitionKey().equals("programmingTask") && "Y".equals(operateResult)) {
+				ncNodeAutoCreateService.createNodeTreeWithProgram(flowCommonService.getProgramProperties(processInstanceId));
+			}
+			if(!"confirmIsUseableTask".equals(task.getTaskDefinitionKey())){
+
+				variables.remove(FlowContants.PROCESS_EDITION);//TODO 涓存椂閿欒鏄紝缁勯暱鎻愪氦鐨勬椂鍊欎細鎻愪氦涓�涓┖涓诧紝娓呯┖浜嗗唴閮ㄦ暟鎹�
+			}else{
+				//鍗囩増
+
+			}
+
 			//鎸囧畾浜嗕笅涓�姝ユ墽琛屼汉
 			taskService.complete(taskId, variables);
 
@@ -80,33 +138,18 @@
 		}else {
 			// 瀹屾垚浠诲姟,缁欓粯璁ょ敤鎴�
 			return R.fail("璇锋寚瀹氭祦绋嬩笅涓�姝ュ鐞嗕汉");
-		}
+		}*/
+
 
 	}
 
-	void addApproveRecord(String taskId, String processInstanceId, String comment,String programIds,Map<String, Object> variables){
-		List<Long> programIdList = new ArrayList<>();
-		if(programIds != null){
-			programIdList = Func.toLongList(programIds);
-		}else{
-			programIdList.add(null);
-		}
+	void addApproveRecord(String taskId,String comment,Map<String, Object> variables){
+		String operateResult = variables.get("approve")+"";
+
 		Task task = taskService.createTaskQuery()
 			.taskId(taskId)
 			.singleResult();
-		for(Long programId : programIdList){
-			ApproveRecord rec = new ApproveRecord();
-			rec.setTaskName(task.getName());
-			rec.setComment(comment);
-			rec.setNcProgramId(programId);
-			rec.setOperateResult(variables.get("approve")+"");//瀹℃壒缁撴灉
-			rec.setOperateTime(DateUtil.now());
-			rec.setProcessInstanceId(processInstanceId);
-			rec.setUserId(AuthUtil.getUserId());
-			rec.setUserNickname(AuthUtil.getNickName());
-
-			approveRecordService.save(rec);
-		}
+		approveRecordService.saveApproveRecords(task,operateResult,comment);
 
 	}
 }

--
Gitblit v1.9.3