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

modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java

@@ -801,14 +801,14 @@ public class CoreHqlPack {
      * @param ids
      * @return
      */
-    public static String packHqlSysDictionaryByIdsAndIsDefault(Long[] ids) {
-        StringBuffer result = new StringBuffer();
+    public static DdlPackBean packHqlSysDictionaryByIdsAndIsDefault(Long[] ids) {
+        DdlPackBean result = new DdlPackBean();
 
         // hql拼接
-        HqlPack.getInPack(StringUtils.join(ids,","),"id",result);
-        HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(),"isDefault",result);
+        DdlPreparedPack.getInPack(StringUtils.join(ids,","),"id",result);
+        DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(),"isDefault",result);
 
-        return result.toString();
+        return result;
     }
 
     /**

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

@@ -56,6 +56,23 @@ public class SoftSwitchHqlPack {
         DdlPreparedPack.getNumEqualPack(bsSuitCaseParam.getSuitCaseId(), "suitCaseId", ddlPackBean);
         DdlPreparedPack.getStringEqualPack(bsSuitCaseParam.getSuitCaseCodeRdd(),"suitCaseCodeRdd",ddlPackBean);
 
+        ddlPackBean.setOrderByStr(bsSuitCaseParam.orderBy());
+
+        return ddlPackBean;
+    }
+
+    /**
+     * 适配套件参数唯一校验
+     * @param bsSuitCaseParam 适配套件参数信息
+     * @return
+     */
+    public static DdlPackBean packHqlCheckBsSuitCaseParamOnly(BsSuitCaseParam bsSuitCaseParam){
+        DdlPackBean ddlPackBean = new DdlPackBean();
+
+        DdlPreparedPack.getNumNOEqualPack(bsSuitCaseParam.getId(),"id",ddlPackBean);
+        DdlPreparedPack.getNumEqualPack(bsSuitCaseParam.getSuitCaseId(), "suitCaseId", ddlPackBean);
+        DdlPreparedPack.getStringLikerPack(bsSuitCaseParam.getParamName(),"paramName",ddlPackBean);
+
         return ddlPackBean;
     }