From 0aaa8112a864392b36e1f10a05c3ae7da0f786e8 Mon Sep 17 00:00:00 2001
From: "wei.peng" <pengwei940613@163.com>
Date: Tue, 30 Apr 2019 19:46:54 +0800
Subject: [PATCH] =?UTF-8?q?=E8=87=AA=E5=AE=9A=E4=B9=89=E8=A1=A8=E5=8D=95?=
 =?UTF-8?q?=E6=8B=A6=E6=88=AA=E5=99=A8=E5=BC=80=E5=8F=911.1=E5=AE=8C?=
 =?UTF-8?q?=E6=88=90=20=20=20=20=20=20=20=20=20=20=20=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=E5=8A=A8=E6=80=81=E8=A1=A8=E5=8D=95=E9=A1=B5=E9=9D=A2=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/cn/estsh/i3plus/pojo/form/bean/BfElement.java  |  4 ++++
 .../java/cn/estsh/i3plus/pojo/model/form/ElementModel.java   | 12 ++++++++++++
 .../cn/estsh/i3plus/pojo/report/bean/BrRefReportTypeset.java |  2 +-
 .../main/java/cn/estsh/i3plus/pojo/report/bean/BrReport.java |  2 +-
 4 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElement.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElement.java
index 7f8fbae..8466ff9 100644
--- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElement.java
+++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElement.java
@@ -105,6 +105,10 @@ public class BfElement extends BaseBean {
     private BfDataObject dataObject;
 
     @Transient
+    @ApiParam(value = "数据对象")
+    private BfElementProperty elementSortProperty;
+
+    @Transient
     @ApiParam(value = "元素表单")
     private BfElementGrid elementGrid;
 
diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/ElementModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/ElementModel.java
index 82e59d5..822b260 100644
--- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/ElementModel.java
+++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/ElementModel.java
@@ -1,5 +1,6 @@
 package cn.estsh.i3plus.pojo.model.form;
 
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
 import cn.estsh.i3plus.pojo.form.bean.*;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
@@ -7,6 +8,7 @@ import io.swagger.annotations.ApiParam;
 import lombok.Data;
 
 import javax.persistence.Column;
+import javax.persistence.Transient;
 import java.util.List;
 
 /**
@@ -36,6 +38,9 @@ public class ElementModel{
     @ApiParam(value = "元素基础属性信息")
     private List<BfElementProperty> propertyList;
 
+    @ApiParam(value = "元素查询排序")
+    private BfElementProperty propertySort;
+
     @ApiParam(value = "元素基础虚拟属性信息")
     private List<BfElementPropertyVirtual> virtualList;
 
@@ -51,4 +56,11 @@ public class ElementModel{
     @ApiParam(value = "元素类型")
     private Integer elementType;
 
+    @ApiParam(value = "排序属性")
+    public String orderByParam;
+
+    //CommonEnumUtil.ASC_OR_DESC  1 asc,2 desc
+    @ApiParam(value = "排序类型，1 正序，2 倒序",example = "1")
+    public Integer ascOrDesc = 1;
+
 }
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/BrRefReportTypeset.java
index ff730f1..c329c15 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/BrRefReportTypeset.java
@@ -59,7 +59,7 @@ public class BrRefReportTypeset extends BaseBean {
     /**
      * 关联元素或模板html
      */
-    @Column(name = "REF_HTML")
+    @Column(name = "REF_HTML",columnDefinition = "TEXT")
     @ApiParam(value = "关联对象html")
     private String refHtml;
 
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 a88c054..f37e43e 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
@@ -55,7 +55,7 @@ public class BrReport extends BaseBean {
     @ApiParam(value ="布局名称")
     private String layoutNameRdd;
 
-    @Column(name="LAYOUT_HTML")
+    @Column(name="LAYOUT_HTML",columnDefinition = "TEXT")
     @ApiParam(value ="报表html")
     private String reportHtml;