Merge remote-tracking branch 'remotes/origin/dev' into test

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/common/XStreamFactory.java

@@ -34,6 +34,9 @@ public class XStreamFactory {
     public static final String CDATA_PREFIX = "<![CDATA[";
     public static final String CDATA_SUFFIX = "]]>";
 
+    private XStreamFactory() {
+    }
+
     public static XStream getXStream() {
         final NameCoder nameCoder = new NoNameCoder();
         XStream xStream = new XStream(new XppDomDriver(nameCoder) {

modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitServerModel.java

@@ -1,5 +1,6 @@
 package cn.estsh.i3plus.pojo.model.softswitch;
 
+import cn.estsh.i3plus.pojo.base.annotation.XStreamCDATA;
 import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil;
 import cn.estsh.i3plus.pojo.softswitch.bean.BsSuitRecord;
 import com.thoughtworks.xstream.annotations.XStreamAlias;

modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/sqlpack/SoftSwitchHqlPack.java

@@ -384,6 +384,17 @@ public class SoftSwitchHqlPack {
     public static DdlPackBean packHqlSuitRecordBySuitCaseCodeAndProcessState(String suitCaseCode, Integer processState){
         DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean();
 
+        DdlPreparedPack.getStringEqualPack(suitCaseCode,"suitCaseCode",ddlPackBean);
+        DdlPreparedPack.getNumEqualPack(processState,"processState",ddlPackBean);
+
+        DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()},new String[]{"getDateTime"},ddlPackBean);
+
+        return ddlPackBean;
+    }
+
+    public static DdlPackBean packHqlSuitDataDetailBySuitCaseCodeAndProcessState(String suitCaseCode, Integer processState){
+        DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean();
+
         DdlPreparedPack.getStringEqualPack(suitCaseCode,"suitCaseCodeRdd",ddlPackBean);
         DdlPreparedPack.getNumEqualPack(processState,"processState",ddlPackBean);
 
@@ -391,10 +402,22 @@ public class SoftSwitchHqlPack {
 
         return ddlPackBean;
     }
+
     public static DdlPackBean packHqlSuitRecordBySuitRecordIdAndProcessState(Long[] suitRecordIds, Integer processState){
         DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean();
 
-        DdlPreparedPack.getInPackArray(suitRecordIds,"suitCaseCodeRdd",ddlPackBean);
+        DdlPreparedPack.getInPackArray(suitRecordIds,"id",ddlPackBean);
+        DdlPreparedPack.getNumEqualPack(processState,"processState",ddlPackBean);
+
+        DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()},new String[]{"getDateTime"},ddlPackBean);
+
+        return ddlPackBean;
+    }
+
+    public static DdlPackBean packHqlSuitDataDetailBySuitRecordIdAndProcessState(Long[] suitRecordIds, Integer processState){
+        DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean();
+
+        DdlPreparedPack.getInPackArray(suitRecordIds,"suitRecordId",ddlPackBean);
         DdlPreparedPack.getNumEqualPack(processState,"processState",ddlPackBean);
 
         DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()},new String[]{"getDateTime"},ddlPackBean);