模板管理生成HTML 完成

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockReportEnumUtil.java

@@ -427,9 +427,9 @@ public class BlockReportEnumUtil {
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum TEMPLATE_STYLE {
 
-        TABLE_LEFT(1, TEMPLATE_TYPE.TABLE, "left", "表单左对齐"),
+        TABLE_LEFT(1, TEMPLATE_TYPE.TABLE, "text-left", "表单左对齐"),
-        TABLE_RIGHT(2, TEMPLATE_TYPE.TABLE, "right", "表单右对齐"),
+        TABLE_RIGHT(2, TEMPLATE_TYPE.TABLE, "text-center", "表单右对齐"),
-        TABLE_CENTER(3, TEMPLATE_TYPE.TABLE, "center", "表单居中");
+        TABLE_CENTER(3, TEMPLATE_TYPE.TABLE, "text-right", "表单居中");
 
         private int value;
         private TEMPLATE_TYPE group;
@@ -471,14 +471,13 @@ public class BlockReportEnumUtil {
             return name;
         }
 
-        public static String valueOf(int val) {
+        public static TEMPLATE_STYLE valueOf(int val) {
-            String tmp = null;
             for (int i = 0; i < values().length; i++) {
                 if (values()[i].value == val) {
-                    tmp = values()[i].getName();
+                    return values()[i];
                 }
             }
-            return tmp;
+            return null;
         }
 
         public static int descOf(String desc) {

modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/report/TemplateModel.java

@@ -1,5 +1,7 @@
 package cn.estsh.i3plus.pojo.model.report;
 
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
 
@@ -13,6 +15,10 @@ import lombok.Data;
 @Data
 public class TemplateModel {
 
+    @ApiParam("模板ID")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long templateId;
+
     @ApiParam("执行 HQL ")
     private String hql;
 

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

@@ -57,11 +57,11 @@ public class BrPojoAttr extends BaseBean {
     private String pojoNameAlias;
 
     @Column(name="ATTR_NAME")
-    @ApiParam(value ="对象别名")
+    @ApiParam(value ="属性别名")
     private String attrName;
 
     @Column(name="ATTR_NAME_ALIAS")
-    @ApiParam(value ="对象别名")
+    @ApiParam(value ="属性别名")
     private String attrNameAlias;
 
     @Column(name="ATTR_TYPE")
@@ -97,6 +97,10 @@ public class BrPojoAttr extends BaseBean {
     @ApiParam(value ="字段样式")
     private Integer attrStyle;
 
+    @Column(name="ATTR_STYLE_RDD")
+    @ApiParam(value ="字段样式")
+    private String attrStyleRdd;
+
     @Column(name="ATTR_DEFAULT_VALUE")
     @ApiParam(value ="属性默认值")
     private String attrDefaultValue;

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

@@ -87,9 +87,9 @@ public class BrTemplate extends BaseBean {
     @ApiParam(value ="模板显示属性" , access ="模板显示属性")
     private String templateAttrShowList;
 
-    @Column(name="NUM_TEMPLATE_AGGREGATION_SHOW")
+    @Column(name="NUM_TEMPLATE_AGGREGATION")
     @ApiParam(value ="对象聚集数量" , example ="0" , access ="对象聚集数量")
-    private Integer numTemplateAggregationShow;
+    private Integer numTemplateAggregation;
 
     @Column(name="TEMPLATE_ATTR_AGGREGATION_LIST",columnDefinition = "TEXT")
     @ApiParam(value ="模板聚集属性" , access ="模板聚集属性")