From eaed7962abbc47cbc8296348bfc52153e01bbf54 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= Date: Fri, 13 Mar 2020 11:22:20 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8A=A8=E6=80=81=E6=9F=A5=E8=AF=A2=EF=BC=9A?= =?UTF-8?q?=E5=B7=A5=E5=8E=82=E4=BB=A3=E7=A0=81=E5=8F=AF=E4=BB=A5=E5=B1=95?= =?UTF-8?q?=E7=A4=BA=E5=9C=A8=E8=A1=A8=E6=A0=BC=E4=B8=AD=E4=BD=86=E6=98=AF?= =?UTF-8?q?=E4=B8=8D=E8=83=BD=E4=BD=9C=E4=B8=BA=E5=8F=AF=E9=80=89=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E6=9D=A1=E4=BB=B6=EF=BC=88BUG#7675=EF=BC=89+=203D?= =?UTF-8?q?=E4=BB=93=E5=BA=93=EF=BC=9A=E5=BA=93=E4=BD=8D=E5=92=8C=E5=AD=98?= =?UTF-8?q?=E5=82=A8=E5=8C=BA=E6=96=B0=E5=A2=9E=E4=BF=AE=E6=94=B9=E7=9A=84?= =?UTF-8?q?=E9=95=BF=E5=AE=BD=E9=AB=98=E6=A0=A1=E9=AA=8C=E9=83=BD=E5=8E=BB?= =?UTF-8?q?=E6=8E=89=EF=BC=88BUG#7723=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/base/annotation/DynamicField.java | 2 +- .../src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java | 1 + .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java | 9 ++++----- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/annotation/DynamicField.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/annotation/DynamicField.java index 4445d2f..954b670 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/annotation/DynamicField.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/annotation/DynamicField.java @@ -25,7 +25,7 @@ public @interface DynamicField { int sort() default 0; // 是否标题字段加粗 是否加粗:默认1-加粗，2-非加粗 int isWider() default 2; - // 是否勾选:默认1-勾选，2-非勾选 + // 是否可选作查询条件:默认1-可选，2-不可选 int isSelect() default 1; // 是否必选:默认1-必选，2-非必选 int isRequire() default 1; diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java index 9e8bd67..3e7e597 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java @@ -65,6 +65,7 @@ public abstract class BaseBean implements Serializable { @Column(name="ORGANIZE_CODE", nullable = false) @ApiParam(value ="组织代码") // @AnnoOutputColumn(hidden = true) + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT,isSelect = 2, isRequire = 2) public String organizeCode; @Column(name="IS_VALID", columnDefinition = "int default 1", nullable = false) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java index 9362c05..378144b 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java @@ -12,10 +12,7 @@ import org.hibernate.annotations.ColumnDefault; 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 javax.persistence.*; /** * @Description :物料实体 @@ -29,7 +26,9 @@ import javax.persistence.Transient; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name = "WMS_PART") +@Table(name = "WMS_PART", indexes = { + @Index(columnList = "ORGANIZE_CODE") +}) @Api("物料表") public class WmsPart extends BaseBean { private static final long serialVersionUID = 4849044986767609346L;