diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockReportEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockReportEnumUtil.java
index f012813..8f6a2f2 100644
--- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockReportEnumUtil.java
+++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockReportEnumUtil.java
@@ -785,20 +785,20 @@ public class BlockReportEnumUtil {
 
     /**
      * 报表排版枚举
-     * ELEMENT(1,"元素"),TEMPLATE(2,"模板");
+     * ELEMENT(1,"元素"),TEMPLATE(2,"对象视图");
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
-    public enum REPORT_TYPESET_TYPE{
+    public enum REPORT_REF_TYPE{
 
-        ELEMENT(1,"元素"),TEMPLATE(2,"模板");
+        ELEMENT(1,"元素"),TEMPLATE(2,"对象视图");
 
         private int value;
         private String description;
 
-        REPORT_TYPESET_TYPE() {
+        REPORT_REF_TYPE() {
         }
 
-        REPORT_TYPESET_TYPE(int value, String description) {
+        REPORT_REF_TYPE(int value, String description) {
             this.value = value;
             this.description = description;
         }
diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/report/BrDynamicPageModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/report/BrDynamicPageModel.java
new file mode 100644
index 0000000..9dc5df5
--- /dev/null
+++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/report/BrDynamicPageModel.java
@@ -0,0 +1,37 @@
+package cn.estsh.i3plus.pojo.model.report;
+
+import cn.estsh.i3plus.pojo.report.bean.BrElement;
+import cn.estsh.i3plus.pojo.report.bean.BrLayout;
+import cn.estsh.i3plus.pojo.report.bean.BrRefReport;
+import cn.estsh.i3plus.pojo.report.bean.BrReport;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : wei.peng
+ * @CreateDate : 20-3-24 下午3:28
+ * @Modify:
+ **/
+@Data
+public class BrDynamicPageModel {
+
+    @ApiParam(value ="报表信息")
+    private BrReport report;
+
+    @ApiParam(value ="布局信息")
+    private BrLayout layout;
+
+    @ApiParam(value = "报表排版关系")
+    private List<BrRefReport> refReportList;
+
+    @ApiParam(value ="页面元素内容")
+    private List<BrElement> elementList;
+
+    @ApiParam(value ="页面元素内容")
+    private List<TemplateModel> templateModelList;
+
+}
diff --git a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrLayout.java b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrLayout.java
index 8f74c2a..0c06f20 100644
--- a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrLayout.java
+++ b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrLayout.java
@@ -28,41 +28,16 @@ import java.util.List;
 @Api(value="自定义报表布局",description = "单独进行管理，生成报表是使用。报表实例 * -》 1")
 public class BrLayout extends BaseBean {
 
+    private static final long serialVersionUID = -3790563562881742852L;
     @Column(name="LAYOUT_NAME")
-    @ApiParam(value ="名称")
+    @ApiParam(value ="布局名称")
     private String layoutName;
 
-    @Column(name="LAYOUT_WIDTH")
-    @ApiParam(value ="布局宽度")
-    private Double layoutWidth;
-
-    @Column(name="LAYOUT_HEIGHT")
-    @ApiParam(value ="布局高度")
-    private Double layoutHeight;
-
-    @Column(name="LAYOUT_ROW_COUNT")
-    @ApiParam(value ="行数")
-    private Integer layoutRowCount;
-
-    @Column(name="LAYOUT_COLUMN_COUNT")
-    @ApiParam(value ="列数")
-    private Integer layoutColumnCount;
-
-    @Column(name="LAYOUT_REPORT_COUNT")
-    @ApiParam(value ="引用报表数量")
-    private Integer layoutReportCount;
-
-//    @Lob
-//    @Column(name="LAYOUT_HTML")
-//    @ApiParam(value ="布局html")
-//    private String layoutHtml;
-//
-//    @Lob
     @Column(name = "LAYOUT_DESCRIPTION")
     @ApiParam(value ="布局描述")
     private String layoutDescription;
 
     @Transient
-    @ApiParam(value ="模板行列表")
-    private List<BrLayoutRow> brLayoutRows;
+    @ApiParam(value ="行所包含的元素")
+    private List<BrLayoutElement> elementList;
 }
diff --git a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrLayoutColumn.java b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrLayoutColumn.java
index 19ca013..5df1631 100644
--- a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrLayoutColumn.java
+++ b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrLayoutColumn.java
@@ -1,80 +1,80 @@
-package cn.estsh.i3plus.pojo.report.bean;
-
-import cn.estsh.i3plus.pojo.base.bean.BaseBean;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiParam;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import org.hibernate.annotations.DynamicInsert;
-import org.hibernate.annotations.DynamicUpdate;
-import org.hibernate.annotations.Type;
-
-import javax.persistence.*;
-import java.util.List;
-
-/**
- * @Description : 自定义报表布局
- * @Reference :
- * @Author : alwaysfrin
- * @CreateDate : 2018-12-25 19:54
- * @Modify:
- **/
-@Data
-@Entity
-@DynamicInsert
-@DynamicUpdate
-@EqualsAndHashCode(callSuper = true)
-@Table(name="BR_LAYOUT_COLUMN")
-@Api(value="自定义报表布局-列",description = "一行包含多列")
-public class BrLayoutColumn extends BaseBean {
-
-    @Column(name="LAYOUT_ID")
-    @ApiParam(value ="布局主键")
-    @JsonSerialize(using = ToStringSerializer.class)
-    private Long layoutId;
-
-    @Column(name="LAYOUT_ROW_ID")
-    @ApiParam(value ="行主键")
-    @JsonSerialize(using = ToStringSerializer.class)
-    private Long layoutRowId;
-
-    @Column(name="COLUMN_COLSPAN")
-    @ApiParam(value ="跨列数")
-    private Integer columnColspan;
-
-    @Column(name="COLUMN_ROWSPAN")
-    @ApiParam(value ="跨行数")
-    private Integer columnRowspan;
-
-    @Column(name="COLUMN_WIDTH")
-    @ApiParam(value ="列宽")
-    private Integer columnWidth;
-
-    @Column(name="COLUMN_HEIGHT")
-    @ApiParam(value ="列高")
-    private Integer columnHeight;
-
-    @Column(name="COLUMN_STYLE")
-    @ApiParam(value ="列样式")
-    private String columnStyle;
-
-    @Column(name="COLUMN_SEQ")
-    @ApiParam(value ="序列")
-    private Integer columnSeq;
-
-    @Column(name="COLUMN_SORT")
-    @ApiParam(value ="排序，降序")
-    private Integer columnSort;
-
-//    @Lob
-    @Column(name = "COLUMN_DESCRIPTION")
-    @ApiParam(value ="列描述")
-    private String columnDescription;
-
-//    @Lob
-//    @Column(name="COLUMN_HTML")
-//    @ApiParam(value ="列html")
-//    private String columnHtml;
-}
+//package cn.estsh.i3plus.pojo.report.bean;
+//
+//import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+//import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+//import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+//import io.swagger.annotations.Api;
+//import io.swagger.annotations.ApiParam;
+//import lombok.Data;
+//import lombok.EqualsAndHashCode;
+//import org.hibernate.annotations.DynamicInsert;
+//import org.hibernate.annotations.DynamicUpdate;
+//import org.hibernate.annotations.Type;
+//
+//import javax.persistence.*;
+//import java.util.List;
+//
+///**
+// * @Description : 自定义报表布局
+// * @Reference :
+// * @Author : alwaysfrin
+// * @CreateDate : 2018-12-25 19:54
+// * @Modify:
+// **/
+//@Data
+//@Entity
+//@DynamicInsert
+//@DynamicUpdate
+//@EqualsAndHashCode(callSuper = true)
+//@Table(name="BR_LAYOUT_COLUMN")
+//@Api(value="自定义报表布局-列",description = "一行包含多列")
+//public class BrLayoutColumn extends BaseBean {
+//
+//    @Column(name="LAYOUT_ID")
+//    @ApiParam(value ="布局主键")
+//    @JsonSerialize(using = ToStringSerializer.class)
+//    private Long layoutId;
+//
+//    @Column(name="LAYOUT_ROW_ID")
+//    @ApiParam(value ="行主键")
+//    @JsonSerialize(using = ToStringSerializer.class)
+//    private Long layoutRowId;
+//
+//    @Column(name="COLUMN_COLSPAN")
+//    @ApiParam(value ="跨列数")
+//    private Integer columnColspan;
+//
+//    @Column(name="COLUMN_ROWSPAN")
+//    @ApiParam(value ="跨行数")
+//    private Integer columnRowspan;
+//
+//    @Column(name="COLUMN_WIDTH")
+//    @ApiParam(value ="列宽")
+//    private Integer columnWidth;
+//
+//    @Column(name="COLUMN_HEIGHT")
+//    @ApiParam(value ="列高")
+//    private Integer columnHeight;
+//
+//    @Column(name="COLUMN_STYLE")
+//    @ApiParam(value ="列样式")
+//    private String columnStyle;
+//
+//    @Column(name="COLUMN_SEQ")
+//    @ApiParam(value ="序列")
+//    private Integer columnSeq;
+//
+//    @Column(name="COLUMN_SORT")
+//    @ApiParam(value ="排序，降序")
+//    private Integer columnSort;
+//
+////    @Lob
+//    @Column(name = "COLUMN_DESCRIPTION")
+//    @ApiParam(value ="列描述")
+//    private String columnDescription;
+//
+////    @Lob
+////    @Column(name="COLUMN_HTML")
+////    @ApiParam(value ="列html")
+////    private String columnHtml;
+//}
diff --git a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrLayoutElement.java b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrLayoutElement.java
new file mode 100644
index 0000000..deb7fed
--- /dev/null
+++ b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrLayoutElement.java
@@ -0,0 +1,76 @@
+package cn.estsh.i3plus.pojo.report.bean;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+import javax.persistence.Transient;
+import java.util.List;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : wei.peng
+ * @CreateDate : 20-3-24 下午2:39
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "BR_LAYOUT_ELEMENT")
+@Api(value = "自定义报表布局元素")
+public class BrLayoutElement extends BaseBean {
+
+    @Column(name = "LAYOUT_ID")
+    @ApiParam(value = "布局主键")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long layoutId;
+
+    @Column(name = "PARENT_ID")
+    @ApiParam(value = "父节点主键")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long parentId;
+
+    @Column(name = "ELEMENT_TEXT")
+    @ApiParam(value ="元素描述")
+    private String elementText;
+
+    @Column(name="ELEMENT_SEQ")
+    @ApiParam(value ="序列")
+    private Integer elementSeq = 0;
+
+    @Column(name="ELEMENT_WIDTH")
+    @ApiParam(value ="列宽")
+    private Integer elementWidth;
+
+    @Column(name="ELEMENT_HEIGHT")
+    @ApiParam(value ="列高")
+    private Integer elementHeight;
+
+    @Column(name="ELEMENT_STYLE")
+    @ApiParam(value ="列样式")
+    private String elementStyle;
+
+    @Column(name="ELEMENT_CSS_CLASS")
+    @ApiParam(value ="列样式")
+    private String elementCssClass;
+
+    @Column(name = "ELEMENT_DESCRIPTION")
+    @ApiParam(value ="元素描述")
+    private String elementDescription;
+
+    @Transient
+    @ApiParam(value ="行所包含的元素")
+    private List<BrLayoutElement> elementList;
+}
diff --git a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrLayoutRow.java b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrLayoutRow.java
index bf6eaa1..784a9d5 100644
--- a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrLayoutRow.java
+++ b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrLayoutRow.java
@@ -1,67 +1,67 @@
-package cn.estsh.i3plus.pojo.report.bean;
-
-import cn.estsh.i3plus.pojo.base.bean.BaseBean;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiParam;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import org.hibernate.annotations.DynamicInsert;
-import org.hibernate.annotations.DynamicUpdate;
-import org.hibernate.annotations.Type;
-
-import javax.persistence.*;
-import java.util.List;
-
-/**
- * @Description : 自定义报表布局
- * @Reference :
- * @Author : alwaysfrin
- * @CreateDate : 2018-12-25 19:54
- * @Modify:
- **/
-@Data
-@Entity
-@DynamicInsert
-@DynamicUpdate
-@EqualsAndHashCode(callSuper = true)
-@Table(name="BR_LAYOUT_ROW")
-@Api(value="自定义报表布局-行",description = "一个布局包含多行，一行包含多列")
-public class BrLayoutRow extends BaseBean {
-
-    @Column(name="LAYOUT_ID")
-    @ApiParam(value ="布局主键")
-    @JsonSerialize(using = ToStringSerializer.class)
-    private Long layoutId;
-
-    @Column(name="ROW_WIDTH")
-    @ApiParam(value ="行宽")
-    private Integer rowWidth;
-
-    @Column(name="ROW_HEIGHT")
-    @ApiParam(value ="行高")
-    private Integer rowHeight;
-
-    @Column(name="ROW_SORT")
-    @ApiParam(value ="排序")
-    private Integer rowSort;
-
-    @Lob
-    @Column(name="ROW_STYLE")
-    @ApiParam(value ="行样式")
-    private String rowStyle;
-
-    @Column(name="ROW_COL_NUM")
-    @ApiParam(value ="行所关联列数")
-    private Integer rowColNum;
-
+//package cn.estsh.i3plus.pojo.report.bean;
+//
+//import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+//import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+//import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+//import io.swagger.annotations.Api;
+//import io.swagger.annotations.ApiParam;
+//import lombok.Data;
+//import lombok.EqualsAndHashCode;
+//import org.hibernate.annotations.DynamicInsert;
+//import org.hibernate.annotations.DynamicUpdate;
+//import org.hibernate.annotations.Type;
+//
+//import javax.persistence.*;
+//import java.util.List;
+//
+///**
+// * @Description : 自定义报表布局
+// * @Reference :
+// * @Author : alwaysfrin
+// * @CreateDate : 2018-12-25 19:54
+// * @Modify:
+// **/
+//@Data
+//@Entity
+//@DynamicInsert
+//@DynamicUpdate
+//@EqualsAndHashCode(callSuper = true)
+//@Table(name="BR_LAYOUT_ROW")
+//@Api(value="自定义报表布局-行",description = "一个布局包含多行，一行包含多列")
+//public class BrLayoutRow extends BaseBean {
+//
+//    @Column(name="LAYOUT_ID")
+//    @ApiParam(value ="布局主键")
+//    @JsonSerialize(using = ToStringSerializer.class)
+//    private Long layoutId;
+//
+//    @Column(name="ROW_WIDTH")
+//    @ApiParam(value ="行宽")
+//    private Integer rowWidth;
+//
+//    @Column(name="ROW_HEIGHT")
+//    @ApiParam(value ="行高")
+//    private Integer rowHeight;
+//
+//    @Column(name="ROW_SORT")
+//    @ApiParam(value ="排序")
+//    private Integer rowSort;
+//
 //    @Lob
-//    @Column(name="ROW_HTML")
-//    @ApiParam(value ="行html")
-//    private String rowHtml;
-
-    @Transient
-    @ApiParam(value ="行所包含的列")
-    private List<BrLayoutColumn> brLayoutColumns;
-}
+//    @Column(name="ROW_STYLE")
+//    @ApiParam(value ="行样式")
+//    private String rowStyle;
+//
+//    @Column(name="ROW_COL_NUM")
+//    @ApiParam(value ="行所关联列数")
+//    private Integer rowColNum;
+//
+////    @Lob
+////    @Column(name="ROW_HTML")
+////    @ApiParam(value ="行html")
+////    private String rowHtml;
+//
+//    @Transient
+//    @ApiParam(value ="行所包含的列")
+//    private List<BrLayoutColumn> brLayoutColumns;
+//}
diff --git a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrRefReportTypeset.java b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrRefReport.java
similarity index 60%
rename from modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrRefReportTypeset.java
rename to modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrRefReport.java
index 286e9ef..76cfc25 100644
--- a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrRefReportTypeset.java
+++ b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrRefReport.java
@@ -12,8 +12,9 @@ import org.hibernate.annotations.DynamicUpdate;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
-import javax.persistence.Lob;
 import javax.persistence.Table;
+import javax.persistence.Transient;
+import java.util.List;
 
 /**
  * @Description : 元素和报表关联表，多对多
@@ -27,46 +28,41 @@ import javax.persistence.Table;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
-@Table(name="BR_REF_REPORT_TYPESET")
+@Table(name="BR_REF_REPORT")
 @Api(value="元素&模板&报表",description = "报表，元素和模板的关联表 * -》 *")
-public class BrRefReportTypeset extends BaseBean {
+public class BrRefReport extends BaseBean {
 
+    private static final long serialVersionUID = 7860212457391123584L;
     @Column(name = "REPORT_ID")
     @ApiParam(value = "报表主键")
     @JsonSerialize(using = ToStringSerializer.class)
     private Long reportId;
 
-    @Column(name = "REPORT_NAME_RDD")
-    @ApiParam(value = "报表名称")
-    private String reportNameRdd;
-
-    @Column(name = "REPORT_TYPESET_TYPE")
-    @ApiParam(value = "报表列类型")
-    private Integer reportTypesetType;
+    @Column(name="LAYOUT_ID")
+    @ApiParam(value ="布局主键")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long layoutId;
 
-    @Column(name = "LAYOUT_COLUMN_ID")
-    @ApiParam(value = "布局列主键")
+    @Column(name = "LAYOUT_ELEMENT_ID")
+    @ApiParam(value = "布局元素主键")
     @JsonSerialize(using = ToStringSerializer.class)
-    private Long layoutColumnId;
+    private Long layoutElementId;
+
+    @Column(name="REF_TYPE_ID")
+    @ApiParam(value ="序列")
+    private Integer refTypeId;
 
-    /**
-     * 关联id，元素或模板id
-     */
     @Column(name = "REF_ID")
     @ApiParam(value = "关联id")
     @JsonSerialize (using = ToStringSerializer.class)
     private Long refId;
 
-//    /**
-//     * 关联元素或模板html
-//     */
-//    @Lob
-//    @Column(name = "REF_HTML")
-//    @ApiParam(value = "关联对象html")
-//    private String refHtml;
+    @Column(name = "REF_NAME_RDD")
+    @ApiParam(value = "关联对象名称")
+    private String refNameRdd;
+
+    @Transient
+    @ApiParam(value = "关联对象")
+    private Object refObject;
 
-    @Lob
-    @Column(name = "TYPESET_DESCRIPTION")
-    @ApiParam(value ="排版描述")
-    private String typesetDescription;
 }
\ No newline at end of file
diff --git a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrReport.java b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrReport.java
index f424ef0..057c231 100644
--- a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrReport.java
+++ b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrReport.java
@@ -10,7 +10,10 @@ import lombok.EqualsAndHashCode;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
 
-import javax.persistence.*;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+import javax.persistence.Transient;
 import java.util.List;
 
 /**
@@ -29,6 +32,7 @@ import java.util.List;
 @Api(value="自定义报表",description = "所有报表实例，生成最后的报表")
 public class BrReport extends BaseBean {
 
+    private static final long serialVersionUID = 1987404021291348713L;
     @Column(name="REPORT_NAME")
     @ApiParam(value ="报表名称")
     private String reportName;
@@ -38,46 +42,19 @@ public class BrReport extends BaseBean {
     @JsonSerialize(using = ToStringSerializer.class)
     private Long layoutId;
 
-    //get单独处理
-    public Long getLayoutId() {
-        if(layoutId != null) {
-            return layoutId.longValue();
-        }else{
-            return layoutId;
-        }
-    }
-
     @Column(name="LAYOUT_NAME_RDD")
     @ApiParam(value ="布局名称")
     private String layoutNameRdd;
 
-    @Lob
-    @Column(name="LAYOUT_HTML")
-    @ApiParam(value ="报表html")
-    private String reportHtml;
-
-    @Column(name="SEQ")
-    @ApiParam(value ="排序")
-    private Integer seq;
-
-    @Column(name="TEMPLATE_NUM")
-    @ApiParam(value ="模板数量")
-    private Integer templateNum;
-
-    @Column(name="ELEMENT_NUM")
-    @ApiParam(value ="元素数量")
-    private Integer elementNum;
-
-    @Lob
     @Column(name = "REPORT_DESCRIPTION")
     @ApiParam(value ="报表描述")
     private String reportDescription;
 
     @Transient
-    @ApiParam(value = "报表关联布局对象")
-    private BrLayout brLayout;
+    @ApiParam(value = "报表排版关系")
+    private BrLayout layout;
 
     @Transient
     @ApiParam(value = "报表排版关系")
-    private List<BrRefReportTypeset> brRefReportTypesetList;
+    private List<BrRefReport> brRefReportList;
 }
diff --git a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrReportTemplate.java b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrReportTemplate.java
index 5fb16dc..15b43da 100644
--- a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrReportTemplate.java
+++ b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrReportTemplate.java
@@ -48,7 +48,7 @@
 //
 //    @Transient
 //    @ApiParam(value ="报表模板列表")
-//    private List<BrRefReportTypeset> brRefReportTypesetList;
+//    private List<BrRefReport> brRefReportList;
 //
 //    @Transient
 //    @ApiParam(value ="元素所在的列")
diff --git a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/repository/BrLayoutColumnRepository.java b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/repository/BrLayoutColumnRepository.java
index 83eab7d..d354521 100644
--- a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/repository/BrLayoutColumnRepository.java
+++ b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/repository/BrLayoutColumnRepository.java
@@ -1,14 +1,14 @@
-package cn.estsh.i3plus.pojo.report.repository;
-
-import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
-import cn.estsh.i3plus.pojo.report.bean.BrLayoutColumn;
-
-/**
- * @Description :
- * @Reference :
- * @Author : alwaysfrin
- * @CreateDate : 2018-12-26 20:23
- * @Modify:
- **/
-public interface BrLayoutColumnRepository extends BaseRepository<BrLayoutColumn,Long> {
-}
+//package cn.estsh.i3plus.pojo.report.repository;
+//
+//import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+//import cn.estsh.i3plus.pojo.report.bean.BrLayoutColumn;
+//
+///**
+// * @Description :
+// * @Reference :
+// * @Author : alwaysfrin
+// * @CreateDate : 2018-12-26 20:23
+// * @Modify:
+// **/
+//public interface BrLayoutColumnRepository extends BaseRepository<BrLayoutColumn,Long> {
+//}
diff --git a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/repository/BrRefReportTypesetRepository.java b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/repository/BrLayoutElementRepository.java
similarity index 58%
rename from modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/repository/BrRefReportTypesetRepository.java
rename to modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/repository/BrLayoutElementRepository.java
index 15695f9..be95592 100644
--- a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/repository/BrRefReportTypesetRepository.java
+++ b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/repository/BrLayoutElementRepository.java
@@ -1,7 +1,7 @@
 package cn.estsh.i3plus.pojo.report.repository;
 
 import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
-import cn.estsh.i3plus.pojo.report.bean.BrRefReportTypeset;
+import cn.estsh.i3plus.pojo.report.bean.BrLayoutElement;
 
 /**
  * @Description :
@@ -10,5 +10,5 @@ import cn.estsh.i3plus.pojo.report.bean.BrRefReportTypeset;
  * @CreateDate : 2018-12-26 20:23
  * @Modify:
  **/
-public interface BrRefReportTypesetRepository extends BaseRepository<BrRefReportTypeset,Long> {
+public interface BrLayoutElementRepository extends BaseRepository<BrLayoutElement,Long> {
 }
diff --git a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/repository/BrLayoutRowRepository.java b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/repository/BrLayoutRowRepository.java
index 78fa134..2588317 100644
--- a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/repository/BrLayoutRowRepository.java
+++ b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/repository/BrLayoutRowRepository.java
@@ -1,14 +1,14 @@
-package cn.estsh.i3plus.pojo.report.repository;
-
-import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
-import cn.estsh.i3plus.pojo.report.bean.BrLayoutRow;
-
-/**
- * @Description :
- * @Reference :
- * @Author : alwaysfrin
- * @CreateDate : 2018-12-26 20:23
- * @Modify:
- **/
-public interface BrLayoutRowRepository extends BaseRepository<BrLayoutRow,Long> {
-}
+//package cn.estsh.i3plus.pojo.report.repository;
+//
+//import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+//import cn.estsh.i3plus.pojo.report.bean.BrLayoutRow;
+//
+///**
+// * @Description :
+// * @Reference :
+// * @Author : alwaysfrin
+// * @CreateDate : 2018-12-26 20:23
+// * @Modify:
+// **/
+//public interface BrLayoutRowRepository extends BaseRepository<BrLayoutRow,Long> {
+//}
diff --git a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/repository/BrRefReportRepository.java b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/repository/BrRefReportRepository.java
new file mode 100644
index 0000000..40aa7b1
--- /dev/null
+++ b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/repository/BrRefReportRepository.java
@@ -0,0 +1,14 @@
+package cn.estsh.i3plus.pojo.report.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.report.bean.BrRefReport;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : alwaysfrin
+ * @CreateDate : 2018-12-26 20:23
+ * @Modify:
+ **/
+public interface BrRefReportRepository extends BaseRepository<BrRefReport,Long> {
+}
diff --git a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/sqlpack/ReportHqlPack.java b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/sqlpack/ReportHqlPack.java
index 5d5ce2b..e485855 100644
--- a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/sqlpack/ReportHqlPack.java
+++ b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/sqlpack/ReportHqlPack.java
@@ -99,14 +99,14 @@ public class ReportHqlPack {
      * @param brElement
      * @return
      */
-    public static String packHqlBrElement(BrElement brElement){
-        StringBuffer result = new StringBuffer();
+    public static DdlPackBean packHqlBrElement(BrElement brElement){
+        DdlPackBean result = DdlPackBean.getDdlPackBean(brElement);
 
         // 查询参数封装
-        HqlPack.getNumEqualPack(brElement.getElementType(),"elementType",result);
-        HqlPack.getStringLikerPack(brElement.getElementName(),"elementName",result);
+        DdlPreparedPack.getNumEqualPack(brElement.getElementType(),"elementType",result);
+        DdlPreparedPack.getStringLikerPack(brElement.getElementName(),"elementName",result);
 
-        return result.toString();
+        return result;
     }
 
     /**
@@ -158,14 +158,32 @@ public class ReportHqlPack {
      * @param brReport
      * @return
      */
-    public static String packHqlBrReport(BrReport brReport){
-        StringBuffer result = new StringBuffer();
+    public static DdlPackBean packHqlBrReport(BrReport brReport){
+        DdlPackBean result = DdlPackBean.getDdlPackBean(brReport);
 
         // 查询参数封装
-        HqlPack.getStringLikerPack(brReport.getReportName(),"reportName",result);
-        HqlPack.getNumEqualPack(brReport.getLayoutId(),"layoutId",result);
+        DdlPreparedPack.getStringLikerPack(brReport.getReportName(),"reportName",result);
+        DdlPreparedPack.getNumEqualPack(brReport.getLayoutId(),"layoutId",result);
 
-        return result.toString();
+        return result;
+    }
+
+    /**
+     * 报表查询
+     * @param refReport
+     * @return
+     */
+    public static DdlPackBean packHqlBrRefReport(BrRefReport refReport){
+        DdlPackBean result = DdlPackBean.getDdlPackBean(refReport);
+
+        // 查询参数封装
+        DdlPreparedPack.getNumEqualPack(refReport.getReportId(),"reportId",result);
+        DdlPreparedPack.getNumEqualPack(refReport.getLayoutId(),"layoutId",result);
+        DdlPreparedPack.getNumEqualPack(refReport.getLayoutElementId(),"layoutElementId",result);
+        DdlPreparedPack.getNumEqualPack(refReport.getRefTypeId(),"refTypeId",result);
+        DdlPreparedPack.getNumEqualPack(refReport.getRefId(),"refId",result);
+
+        return result;
     }
 
     /**
@@ -225,4 +243,12 @@ public class ReportHqlPack {
 
         return result;
     }
+
+    public static DdlPackBean packHqlBrLayoutElement(BrLayoutElement bean){
+        DdlPackBean result = DdlPackBean.getDdlPackBean(bean);
+
+        DdlPreparedPack.getNumEqualPack(bean.getLayoutId(),"layoutId",result);
+
+        return result;
+    }
 }