From bc4056543fdbef38ac8bf1648df934d5bc8e5bde Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期四, 07 八月 2025 01:31:11 +0800
Subject: [PATCH] 调试固化流程
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/controller/DispatchController.java | 43 +++++++++++++++++++++++++++++++++++--------
1 files changed, 35 insertions(+), 8 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 c3a583e..b496b9c 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
@@ -9,6 +9,7 @@
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;
@@ -22,6 +23,9 @@
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.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;
@@ -50,11 +54,11 @@
private final ProcessProgRefService processProgRefService;
private final ApproveRecordService approveRecordService;
- private final FlowCommonService flowCommonService;
-
private final FlowProgramFileService flowProgramFileService;
- private final NcNodeAutoCreateService ncNodeAutoCreateService;
+
+ private final TryFlowCompleteService tryFlowCompleteService;
+ private final DefaultFlowCompleteService defaultFlowCompleteService;
/**
* 鍙戣捣娲惧伐娴佺▼
*/
@@ -65,10 +69,25 @@
return R.status(true);
}
+ 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(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();
@@ -89,11 +108,18 @@
variables.put(FlowContants.LAST_STEP_USER_NICKNAME,AuthUtil.getNickName());
if(variables.containsKey("assignee")){
- addApproveRecord(taskId,processInstanceId,comment,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{
+ //鍗囩増
+
}
//鎸囧畾浜嗕笅涓�姝ユ墽琛屼汉
@@ -103,17 +129,18 @@
}else {
// 瀹屾垚浠诲姟,缁欓粯璁ょ敤鎴�
return R.fail("璇锋寚瀹氭祦绋嬩笅涓�姝ュ鐞嗕汉");
- }
+ }*/
+
}
- void addApproveRecord(String taskId, String processInstanceId, String comment,Map<String, Object> variables){
+ void addApproveRecord(String taskId,String comment,Map<String, Object> variables){
String operateResult = variables.get("approve")+"";
Task task = taskService.createTaskQuery()
.taskId(taskId)
.singleResult();
- approveRecordService.saveApproveRecords(task,processInstanceId,operateResult,comment);
+ approveRecordService.saveApproveRecords(task,operateResult,comment);
}
}
--
Gitblit v1.9.3