报表优化

解决bug

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

@@ -408,6 +408,7 @@ public class CoreHqlPack {
         HqlPack.getStringEqualPack(dictionary.getDictionaryCode(),"dictionaryCode",result);
         // not
         HqlPack.getNumNOEqualPack(dictionary.getId(),"id",result);
+        HqlPack.getNumNOEqualPack(dictionary.getParentId(),"parentId",result);
 
         // 添加默认排序
         HqlPack.getOrderDefault(dictionary);
@@ -425,9 +426,9 @@ public class CoreHqlPack {
 
         // and
         HqlPack.getStringEqualPack(dictionary.getDictionaryValue(),"dictionaryValue",result);
-        HqlPack.getNumEqualPack(dictionary.getParentId(),"parentId",result);
         // not
         HqlPack.getNumNOEqualPack(dictionary.getId(),"id",result);
+        HqlPack.getNumNOEqualPack(dictionary.getParentId(),"parentId",result);
 
         // 添加默认排序
         HqlPack.getOrderDefault(dictionary);
@@ -603,7 +604,13 @@ public class CoreHqlPack {
         return result.toString();
     }
 
-
+    /**
+     * 大小区间比较
+     * @param columnName
+     * @param min
+     * @param max
+     * @return
+     */
     public static String packHqlByInterval(String columnName,Object min,Object max){
         StringBuffer result =  new StringBuffer();
 
@@ -612,4 +619,20 @@ public class CoreHqlPack {
 
         return result.toString();
     }
+
+
+    /**
+     * 字典信息查询id集合中是否存在默认数据
+     * @param ids
+     * @return
+     */
+    public static String packHqlSysDictionaryByIdsAndIsDefault(Long[] ids) {
+        StringBuffer result = new StringBuffer();
+
+        // hql拼接
+        HqlPack.getInPack(StringUtils.join(ids,","),"id",result);
+        HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(),"isDefault",result);
+
+        return result.toString();
+    }
 }