From c934c1efc82f265f7c2e6dd3b9eb769d30217324 Mon Sep 17 00:00:00 2001
From: dimengzhe <251008545@qq.com>
Date: Wed, 27 Jul 2022 15:47:15 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A7=BB=E5=8A=A8=E5=BE=85=E5=8A=9E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../yxt/anrui/portal/api/flow/app/AppDoVo.java   | 16 ++++++++++++++++
 .../anrui/portal/api/flow/app/FlowTaskDoVo.java  |  3 +++
 .../anrui/portal/biz/flow/FlowableService.java   | 11 ++++++-----
 3 files changed, 25 insertions(+), 5 deletions(-)
 create mode 100644 anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/flow/app/AppDoVo.java

diff --git a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/flow/app/AppDoVo.java b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/flow/app/AppDoVo.java
new file mode 100644
index 0000000000..1b67eebc2c
--- /dev/null
+++ b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/flow/app/AppDoVo.java
@@ -0,0 +1,16 @@
+package com.yxt.anrui.portal.api.flow.app;
+
+import com.yxt.common.core.vo.Vo;
+import lombok.Data;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/7/27 15:43
+ * @Description
+ */
+@Data
+public class AppDoVo implements Vo {
+    private static final long serialVersionUID = 5961814504319670249L;
+    private String json;
+    private String moduleAction;
+}
diff --git a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/flow/app/FlowTaskDoVo.java b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/flow/app/FlowTaskDoVo.java
index ec5c7920ae..5c9abe60f1 100644
--- a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/flow/app/FlowTaskDoVo.java
+++ b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/flow/app/FlowTaskDoVo.java
@@ -45,4 +45,7 @@ public class FlowTaskDoVo implements Vo {
     @ApiModelProperty("办理的url")
     @JsonIgnore
     private SysProUrlVo sysProUrlVo;
+
+    @JsonIgnore
+    private AppDoVo appDoVo;
 }
diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/flow/FlowableService.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/flow/FlowableService.java
index 67c00b515f..258c874b9c 100644
--- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/flow/FlowableService.java
+++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/flow/FlowableService.java
@@ -44,6 +44,7 @@ import com.yxt.anrui.flowable.sqloperationsymbol.BusinessVariables;
 import com.yxt.anrui.flowable.sqloperationsymbol.SQLOperationSymbol;
 import com.yxt.anrui.portal.api.appsubsetversion.AppSubsetVersionVo;
 import com.yxt.anrui.portal.api.flow.*;
+import com.yxt.anrui.portal.api.flow.app.AppDoVo;
 import com.yxt.anrui.portal.api.flow.app.AppVo;
 import com.yxt.anrui.portal.api.flow.app.FlowTaskDoQuery;
 import com.yxt.anrui.portal.api.flow.app.FlowTaskDoVo;
@@ -511,14 +512,14 @@ public class FlowableService extends MybatisBaseService<FlowableMapper, Flowable
             Map<String, Object> appMap = ConstantUtils.getMap(flowMap, "app");
             String json = JSONObject.toJSONString(appMap);
             System.out.println(json);
-            AppVo appVo = new AppVo();
-            appVo.setJson(json);
+            AppDoVo appDoVo = new AppDoVo();
+            appDoVo.setJson(json);
             //app版本的sid
             String appSid = "";
             //app版本的类型
             String type = "";
             if (f.getSysProUrlVo() != null) {
-                appVo.setModuleAction(f.getSysProUrlVo().getUrl());
+                appDoVo.setModuleAction(f.getSysProUrlVo().getUrl());
                 appSid = f.getSysProUrlVo().getModulePluginName();
             }
             //根据appSid查询最新版本的app插件包:以及类型：2插件，1框架
@@ -540,7 +541,7 @@ public class FlowableService extends MybatisBaseService<FlowableMapper, Flowable
                 integers.add(i);
                 appVer.put(appSid2, integers);
             }
-            voList.get(i).setAppVariables(appVo);
+            voList.get(i).setAppDoVo(appDoVo);
         }
         // 循环取map:若为同一个app版本，则只查询一次
         for (String key : appVer.keySet()) {
@@ -553,7 +554,7 @@ public class FlowableService extends MybatisBaseService<FlowableMapper, Flowable
                 appVo.setType("2");
                 appVo.setModulePluginName(appSubsetVersions.getModulePluginName());
                 for (int i = 0; i < integers.size(); i++) {
-                    BeanUtil.copyProperties(voList.get(i).getAppVariables(), appVo);
+                    BeanUtil.copyProperties(voList.get(i).getAppDoVo(), appVo);
                     voList.get(i).setAppVariables(appVo);
                 }
             }