Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev

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

@@ -64,5 +64,5 @@ public class BrLayout extends BaseBean {
 
     @Transient
     @ApiParam(value ="模板行列表")
-    private List<BrLayoutRow> brLayoutRowList;
+    private List<BrLayoutRow> brLayoutRows;
 }

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

@@ -58,6 +58,10 @@ public class BrLayoutColumn extends BaseBean {
     @ApiParam(value ="列高")
     private Integer columnHeight;
 
+    @Column(name="COLUMN_STYLE")
+    @ApiParam(value ="列样式")
+    private String columnStyle;
+
     @Column(name="SEQ")
     @ApiParam(value ="排序")
     private Integer seq;

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

@@ -53,8 +53,12 @@ public class BrLayoutRow extends BaseBean {
     @ApiParam(value ="行样式")
     private String rowStyle;
 
+    @Column(name="ROW_COL_NUM")
+    @ApiParam(value ="行所关联列数")
+    private Integer rowColNum;
+
     @Column(name="ROW_HTML")
-    @ApiParam(value ="行样式")
+    @ApiParam(value ="行html")
     private String rowHtml;
 
     @Transient

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

@@ -55,10 +55,10 @@ public class BrRefReportElement extends BaseBean {
     @ApiParam(value = "元素名称")
     private String elementNameRdd;
 
-    @Column(name = "ELEMENT_HTML_RDD")
+    @Column(name = "ELEMENT_HTML_RDD",columnDefinition = "TEXT")
     @ApiParam(value = "元素html")
     @JsonSerialize(using = ToStringSerializer.class)
-    private Long elementHtmlRdd;
+    private String elementHtmlRdd;
 
     @Transient
     @ApiParam(value = "报表实例")

modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/sqlpack/ReportHqlPack.java

@@ -1,7 +1,9 @@
 package cn.estsh.i3plus.pojo.report.sqlpack;
 
+import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
 import cn.estsh.i3plus.pojo.base.tool.HqlPack;
 import cn.estsh.i3plus.pojo.report.bean.BrElement;
+import cn.estsh.i3plus.pojo.report.bean.BrLayout;
 import cn.estsh.i3plus.pojo.report.bean.BrMenu;
 import org.apache.commons.lang3.StringUtils;
 
@@ -76,4 +78,48 @@ public class ReportHqlPack {
 
         return result.toString();
     }
+
+    /**
+     * 报表布局查询
+     * @param brLayout
+     * @return
+     */
+    public static String packHqlBrLayout(BrLayout brLayout){
+        StringBuffer result = new StringBuffer();
+
+        // 查询参数封装
+        HqlPack.getStringLikerPack(brLayout.getLayoutName(),"layoutName",result);
+
+        return result.toString();
+    }
+
+    /**
+     * 按顺序查询行中的单元格
+     * @param rowId
+     * @return
+     */
+    public static String packHqlBrLayoutColumnByRowIdSortBySeq(Long rowId){
+        StringBuffer result = new StringBuffer();
+
+        // 查询参数封装
+        HqlPack.getNumEqualPack(rowId,"layoutRowId",result);
+        HqlPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.ASC.getValue()},new String[]{"seq"},result);
+
+        return result.toString();
+    }
+
+    /**
+     * 按顺序查询报表中的行
+     * @param layoutId
+     * @return
+     */
+    public static String packHqlBrLayoutColumnByLayoutIdSortBySeq(Long layoutId){
+        StringBuffer result = new StringBuffer();
+
+        // 查询参数封装
+        HqlPack.getNumEqualPack(layoutId,"layoutId",result);
+        HqlPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.ASC.getValue()},new String[]{"seq"},result);
+
+        return result.toString();
+    }
 }