From e790b209e562f1b52308c96583ea432ce57fbc0f Mon Sep 17 00:00:00 2001 From: "yihang.lv" Date: Tue, 30 Apr 2019 19:16:35 +0800 Subject: [PATCH 1/3] =?UTF-8?q?sweb=E5=BC=80=E7=AA=97=E6=94=B9=E4=B8=BA?= =?UTF-8?q?=E5=BE=AE=E6=9C=8D=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/wms/modelbean/WmsBasVendorModel.java | 26 +++++++++++++++++++++ .../i3plus/pojo/wms/modelbean/WmsPartModel.java | 27 ++++++++++++++++++++++ 2 files changed, 53 insertions(+) create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsBasVendorModel.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsPartModel.java diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsBasVendorModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsBasVendorModel.java new file mode 100644 index 0000000..bd413a9 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsBasVendorModel.java @@ -0,0 +1,26 @@ +package cn.estsh.i3plus.pojo.wms.modelbean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.common.Pager; +import cn.estsh.i3plus.pojo.wms.bean.BasVendor; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +/** + * @Description : 供应商微服调用Model + * @Reference : + * @Author : jack.lv + * @CreateDate : 2019-04-30 19:18 + * @Modify: + **/ +@Data +@Api("供应商微服调用Model") +public class WmsBasVendorModel extends BaseBean { + + @ApiParam("供应商") + private BasVendor basVendor; + + @ApiParam("分页对象") + private Pager pager; +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsPartModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsPartModel.java new file mode 100644 index 0000000..f842855 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsPartModel.java @@ -0,0 +1,27 @@ +package cn.estsh.i3plus.pojo.wms.modelbean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.common.Pager; +import cn.estsh.i3plus.pojo.wms.bean.BasVendor; +import cn.estsh.i3plus.pojo.wms.bean.WmsPart; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +/** + * @Description : 供应商微服调用Model + * @Reference : + * @Author : jack.lv + * @CreateDate : 2019-04-30 19:18 + * @Modify: + **/ +@Data +@Api("供应商微服调用Model") +public class WmsPartModel extends BaseBean { + + @ApiParam("物料") + private WmsPart wmsPart; + + @ApiParam("分页对象") + private Pager pager; +} From d1ac366574eb5b3661858c3e96813ded3a883cf3 Mon Sep 17 00:00:00 2001 From: "wei.peng" Date: Tue, 30 Apr 2019 19:45:01 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E8=87=AA=E5=AE=9A=E4=B9=89=E8=A1=A8?= =?UTF-8?q?=E5=8D=95=E6=8B=A6=E6=88=AA=E5=99=A8=E5=BC=80=E5=8F=911.1?= =?UTF-8?q?=E5=AE=8C=E6=88=90=20=20=20=20=20=20=20=20=20=20=20=E4=BC=98?= =?UTF-8?q?=E5=8C=96=E5=8A=A8=E6=80=81=E8=A1=A8=E5=8D=95=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/form/bean/BfElementTree.java | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementTree.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementTree.java index aefdef9..ef4c996 100644 --- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementTree.java +++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementTree.java @@ -42,16 +42,28 @@ public class BfElementTree extends BaseBean { @JsonSerialize(using = ToStringSerializer.class) private Long treeParentId; + @Column(name = "TREE_PARENT_RDD") + @ApiParam(value = "父级属性ID") + private String treeParentRdd; + @Column(name = "TREE_ATTR_NAME_ID") @ApiParam(value = "显示属性ID") @JsonSerialize(using = ToStringSerializer.class) private Long treeAttrNameId; + @Column(name = "TREE_ATTR_NAME_RDD") + @ApiParam(value = "显示属性ID") + private String treeAttrNameRdd; + @Column(name = "TREE_ATTR_VALUE_ID") @ApiParam(value = "取值属性ID") @JsonSerialize(using = ToStringSerializer.class) private Long treeAttrValueId; + @Column(name = "TREE_ATTR_VALUE_RDD") + @ApiParam(value = "取值属性ID") + private String treeAttrValueRdd; + @Column(name="TREE_IS_OPEN_ALL") @ApiParam(value ="是否全部展开") private Integer treeIsOpenAll; From 0aaa8112a864392b36e1f10a05c3ae7da0f786e8 Mon Sep 17 00:00:00 2001 From: "wei.peng" Date: Tue, 30 Apr 2019 19:46:54 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E8=87=AA=E5=AE=9A=E4=B9=89=E8=A1=A8?= =?UTF-8?q?=E5=8D=95=E6=8B=A6=E6=88=AA=E5=99=A8=E5=BC=80=E5=8F=911.1?= =?UTF-8?q?=E5=AE=8C=E6=88=90=20=20=20=20=20=20=20=20=20=20=20=E4=BC=98?= =?UTF-8?q?=E5=8C=96=E5=8A=A8=E6=80=81=E8=A1=A8=E5=8D=95=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E6=8E=A5=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 propertyList; + @ApiParam(value = "元素查询排序") + private BfElementProperty propertySort; + @ApiParam(value = "元素基础虚拟属性信息") private List 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;