From a76d70851d5204252bc14e2ca69de50e55d7b8a4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= <yunhao.wang@estsh.com>
Date: Mon, 30 Dec 2019 19:17:12 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E8=BD=AF=E9=80=82=E9=85=8D=20=E9=80=82?=
 =?UTF-8?q?=E9=85=8D=E8=AE=B0=E5=BD=95=E5=8F=82=E6=95=B0=20=E5=88=86?=
 =?UTF-8?q?=E9=A1=B5=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pojo/softswitch/sqlpack/SoftSwitchHqlPack.java | 23 +++++++++-------------
 1 file changed, 9 insertions(+), 14 deletions(-)

diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/sqlpack/SoftSwitchHqlPack.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/sqlpack/SoftSwitchHqlPack.java
index b1a9344..6bf3024 100644
--- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/sqlpack/SoftSwitchHqlPack.java
+++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/sqlpack/SoftSwitchHqlPack.java
@@ -4,19 +4,7 @@ import cn.estsh.i3plus.pojo.base.bean.DdlPackBean;
 import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
 import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack;
 import cn.estsh.i3plus.pojo.base.tool.HqlPack;
-import cn.estsh.i3plus.pojo.softswitch.bean.BsDataSource;
-import cn.estsh.i3plus.pojo.softswitch.bean.BsParamAdapter;
-import cn.estsh.i3plus.pojo.softswitch.bean.BsSslKey;
-import cn.estsh.i3plus.pojo.softswitch.bean.BsSslKeyParam;
-import cn.estsh.i3plus.pojo.softswitch.bean.BsSuitCase;
-import cn.estsh.i3plus.pojo.softswitch.bean.BsSuitCaseDataSourceTable;
-import cn.estsh.i3plus.pojo.softswitch.bean.BsSuitCaseParam;
-import cn.estsh.i3plus.pojo.softswitch.bean.BsSuitCaseWebService;
-import cn.estsh.i3plus.pojo.softswitch.bean.BsSuitDataDetail;
-import cn.estsh.i3plus.pojo.softswitch.bean.BsSuitFile;
-import cn.estsh.i3plus.pojo.softswitch.bean.BsSuitRecord;
-import cn.estsh.i3plus.pojo.softswitch.bean.BsSuitSchedule;
-import cn.estsh.i3plus.pojo.softswitch.bean.TestDataBase;
+import cn.estsh.i3plus.pojo.softswitch.bean.*;
 
 /**
  * @Description :
@@ -415,7 +403,6 @@ public class SoftSwitchHqlPack {
 
         return ddlPackBean;
     }
-
     public static DdlPackBean packHqlSuitDataDetailBySuitRecordIdAndProcessState(Long[] suitRecordIds, Integer processState){
         DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean();
 
@@ -426,4 +413,12 @@ public class SoftSwitchHqlPack {
 
         return ddlPackBean;
     }
+
+    public static DdlPackBean packHqlBsSuitRecordParam(BsSuitRecordParam bsSuitRecordParam){
+        DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean();
+
+        DdlPreparedPack.getNumEqualPack(bsSuitRecordParam.getSuitRecordId(),"suitRecordId",ddlPackBean);
+
+        return ddlPackBean;
+    }
 }

From b0b671aac01dc388d1c8fd6963263811b1cab88c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= <yunhao.wang@estsh.com>
Date: Tue, 31 Dec 2019 14:18:24 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E8=BD=AF=E9=80=82=E9=85=8D=20=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E6=BA=90=E9=80=82=E9=85=8D=E5=99=A8=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/cn/estsh/i3plus/pojo/model/softswitch/SuitClientModel.java     | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitClientModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitClientModel.java
index a798d8b..806c17b 100644
--- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitClientModel.java
+++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitClientModel.java
@@ -4,6 +4,7 @@ import cn.estsh.i3plus.pojo.base.annotation.XStreamCDATA;
 import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
 import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil;
 import cn.estsh.i3plus.pojo.softswitch.bean.BsSuitRecord;
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.thoughtworks.xstream.annotations.XStreamAlias;
 import com.thoughtworks.xstream.annotations.XStreamAsAttribute;
 import com.thoughtworks.xstream.annotations.XStreamOmitField;
@@ -90,6 +91,7 @@ public class SuitClientModel {
     /**
      * 适配报文
      */
+    @JsonIgnore
     @XStreamCDATA
     private Object suitResultMessage;