From 4ee9cbfe38dfdab4de1ec260487a81472169a5cc Mon Sep 17 00:00:00 2001
From: yxt_djz <313618925@qq.com>
Date: Wed, 6 Jul 2022 13:47:12 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=88=B7=E6=96=B0=E4=B8=9A?=
 =?UTF-8?q?=E5=8A=A1=E5=89=8D=E7=AB=AF=E6=97=B6=E5=8A=9F=E8=83=BD=E6=8A=A5?=
 =?UTF-8?q?=E9=94=99=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../anrui/flowable/api/flow/FlowableFeign.java    |  2 +-
 .../yxt/anrui/flowable/biz/flow/FlowableRest.java |  6 +++---
 .../anrui/flowable/biz/flow/FlowableService.java  | 15 ++++++---------
 3 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/flow/FlowableFeign.java b/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/flow/FlowableFeign.java
index 7a8f486adb..b9842437aa 100644
--- a/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/flow/FlowableFeign.java
+++ b/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/flow/FlowableFeign.java
@@ -112,5 +112,5 @@ public interface FlowableFeign {
     @ApiOperation(value = "终止流程")
     @PostMapping(value = "/breakProcess")
     @ResponseBody
-    ResultBean breakProcess(@RequestBody com.yxt.anrui.flowable.api.flowtask.FlowTaskVo fl);
+    ResultBean<UpdateFlowFieldVo> breakProcess(@RequestBody com.yxt.anrui.flowable.api.flowtask.FlowTaskVo fl);
 }
diff --git a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow/FlowableRest.java b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow/FlowableRest.java
index d3cb695880..6f08ff3e98 100644
--- a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow/FlowableRest.java
+++ b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow/FlowableRest.java
@@ -354,10 +354,10 @@ public class FlowableRest implements FlowableFeign {
     }
 
     @Override
-    public ResultBean breakProcess(com.yxt.anrui.flowable.api.flowtask.FlowTaskVo fl) {
-        ResultBean rb = ResultBean.fireFail();
+    public ResultBean<UpdateFlowFieldVo> breakProcess(com.yxt.anrui.flowable.api.flowtask.FlowTaskVo fl) {
+        ResultBean<UpdateFlowFieldVo> rb = ResultBean.fireFail();
         UpdateFlowFieldVo vo = new UpdateFlowFieldVo();
-        ResultBean resultBean = flowableService.breakProcess(fl);
+        ResultBean<UpdateFlowFieldVo> resultBean = flowableService.breakProcess(fl);
         if (!resultBean.getSuccess()) {
             return resultBean;
         }
diff --git a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow/FlowableService.java b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow/FlowableService.java
index 12844c70f2..1558763c89 100644
--- a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow/FlowableService.java
+++ b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow/FlowableService.java
@@ -1,10 +1,7 @@
 package com.yxt.anrui.flowable.biz.flow;
 
 import cn.hutool.core.bean.BeanUtil;
-import com.yxt.anrui.flowable.api.flow.FlowTaskQuery;
-import com.yxt.anrui.flowable.api.flow.FlowTaskVo;
-import com.yxt.anrui.flowable.api.flow.Flowable;
-import com.yxt.anrui.flowable.api.flow.TaskQuery;
+import com.yxt.anrui.flowable.api.flow.*;
 import com.yxt.anrui.flowable.api.flowtask.FlowTask;
 import com.yxt.anrui.flowable.api.flowtask.LatestTaskVo;
 import com.yxt.anrui.flowable.api.utils.ProcessStateEnum;
@@ -236,16 +233,16 @@ public class FlowableService extends MybatisBaseService<FlowableMapper, Flowable
      * @param flowTaskVo
      * @return
      */
-    public ResultBean breakProcess(com.yxt.anrui.flowable.api.flowtask.FlowTaskVo flowTaskVo) {
+    public ResultBean<UpdateFlowFieldVo> breakProcess(com.yxt.anrui.flowable.api.flowtask.FlowTaskVo flowTaskVo) {
       /*  com.yxt.anrui.flowable.api.flowtask.FlowTaskVo fl = new com.yxt.anrui.flowable.api.flowtask.FlowTaskVo();
         BeanUtil.copyProperties(flowTaskVo, fl);*/
-        ResultBean resultBean = flowTaskService.breakProcess(flowTaskVo);
+        ResultBean<UpdateFlowFieldVo> resultBean = flowTaskService.breakProcess(flowTaskVo);
         if (!resultBean.getSuccess()) {
             return resultBean;
         }
-        Map<String, String> map = new HashMap<>();
-        map.put("nodeState", String.valueOf(resultBean.getData()));
-        return resultBean.success().setData(map);
+        UpdateFlowFieldVo vo=new UpdateFlowFieldVo();
+        vo.setNodeState(String.valueOf(resultBean.getData()));
+        return resultBean.success().setData(vo);
     }
 
     public void stopProcess(FlowTaskVo flowTaskVo) {