From b5b28e8b9c639f49e69efc60684e68bf642d1092 Mon Sep 17 00:00:00 2001
From: xiejun <xj@2023>
Date: 星期三, 21 六月 2023 16:43:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS/ubcs-ops/ubcs-flow/src/main/java/com/vci/ubcs/flow/engine/controller/VCIFlowController.java | 15 ++++++++-------
1 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/Source/UBCS/ubcs-ops/ubcs-flow/src/main/java/com/vci/ubcs/flow/engine/controller/VCIFlowController.java b/Source/UBCS/ubcs-ops/ubcs-flow/src/main/java/com/vci/ubcs/flow/engine/controller/VCIFlowController.java
index fba4637..bb40cc7 100644
--- a/Source/UBCS/ubcs-ops/ubcs-flow/src/main/java/com/vci/ubcs/flow/engine/controller/VCIFlowController.java
+++ b/Source/UBCS/ubcs-ops/ubcs-flow/src/main/java/com/vci/ubcs/flow/engine/controller/VCIFlowController.java
@@ -1,8 +1,7 @@
package com.vci.ubcs.flow.engine.controller;
import com.vci.ubcs.flow.core.entity.BladeFlow;
-import com.vci.ubcs.flow.engine.entity.FlowTaskUserC;
-import com.vci.ubcs.flow.engine.service.FlowTaskUserService;
+import com.vci.ubcs.flow.engine.entity.FlowTaskDTO;
import com.vci.ubcs.flow.engine.service.VICFlowService;
import lombok.AllArgsConstructor;
import org.springblade.core.tenant.annotation.NonDS;
@@ -10,6 +9,8 @@
import org.springframework.web.bind.annotation.*;
import java.util.List;
+
+import static com.vci.ubcs.flow.engine.service.impl.VCIFlowserviceImpl.NODE_NEXT;
/**
@@ -30,15 +31,15 @@
* @return
*/
@PostMapping("start")
- public R<BladeFlow> list(@RequestBody FlowTaskUserC flowTaskUserC) {
+ public R<BladeFlow> list(@RequestBody FlowTaskDTO flowTaskUserC) {
return vicFlowService.startProcess(flowTaskUserC);
}
/**
- * 娴佺▼棰勬祴
+ * 娴佺▼棰勬祴,娴佺▼浠诲姟鎸夐挳
*/
- @PostMapping("a")
- public R<BladeFlow> a(@RequestBody FlowTaskUserC flowTaskUserC) {
- return vicFlowService.startProcess(flowTaskUserC);
+ @PostMapping("next")
+ public R<FlowTaskDTO> next(@RequestBody FlowTaskDTO flowTaskUserC) {
+ return R.data(vicFlowService.nextFlowNode(NODE_NEXT,flowTaskUserC.getProcessInstanceId()));
}
}
--
Gitblit v1.9.3