字典调整

modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysDictionary.java

@@ -1,6 +1,7 @@
 package cn.estsh.i3plus.pojo.platform.bean;
 
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import io.swagger.annotations.Api;
@@ -38,6 +39,11 @@ public class SysDictionary extends BaseBean {
     @ApiParam(value ="字典代码")
     private String dictionaryCode;
 
+    //枚举 CommonEnumUtil.SOFT_TYPE
+    @Column(name="SOFT_TYPE")
+    @ApiParam(value ="微服务软件类型")
+    private Integer softType;
+
     // 根节点-1
     @Column(name="PARENT_ID")
     @ApiParam(value ="父节点" , example = "-1")

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

@@ -406,9 +406,10 @@ public class CoreHqlPack {
 
         // and
         HqlPack.getStringEqualPack(dictionary.getDictionaryCode(),"dictionaryCode",result);
+        HqlPack.getNumEqualPack(dictionary.getParentId(),"parentId",result);
+        HqlPack.getNumEqualPack(dictionary.getSoftType(),"softType",result);
         // not
         HqlPack.getNumNOEqualPack(dictionary.getId(),"id",result);
-        HqlPack.getNumNOEqualPack(dictionary.getParentId(),"parentId",result);
 
         // 添加默认排序
         HqlPack.getOrderDefault(dictionary);
@@ -426,9 +427,10 @@ public class CoreHqlPack {
 
         // and
         HqlPack.getStringEqualPack(dictionary.getDictionaryValue(),"dictionaryValue",result);
+        HqlPack.getNumEqualPack(dictionary.getParentId(),"parentId",result);
+        HqlPack.getNumEqualPack(dictionary.getSoftType(),"softType",result);
         // not
         HqlPack.getNumNOEqualPack(dictionary.getId(),"id",result);
-        HqlPack.getNumNOEqualPack(dictionary.getParentId(),"parentId",result);
 
         // 添加默认排序
         HqlPack.getOrderDefault(dictionary);

modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrLayoutRow.java

@@ -49,8 +49,6 @@ public class BrLayoutRow extends BaseBean {
     @ApiParam(value ="排序")
     private Integer rowSort;
 
-    private Integer rowSeq;
-
     @Column(name="ROW_STYLE",columnDefinition = "TEXT")
     @ApiParam(value ="行样式")
     private String rowStyle;