From b0a4eccca4e7f08add2c6925d4b874f202512929 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Tue, 17 Mar 2020 14:29:08 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A6=81=E7=94=A8=E5=90=AF=E7=94=A8=EF=BC=8C?= =?UTF-8?q?=E8=BD=AF=E5=88=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/form/bean/BfDataObjectProperty.java | 4 ++++ .../java/cn/estsh/i3plus/pojo/form/bean/BfElementConstraint.java | 4 +++- .../main/java/cn/estsh/i3plus/pojo/form/bean/BfElementProperty.java | 5 +++++ 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfDataObjectProperty.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfDataObjectProperty.java index 54b9201..6ea46e8 100644 --- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfDataObjectProperty.java +++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfDataObjectProperty.java @@ -120,6 +120,10 @@ public class BfDataObjectProperty extends BaseBean { private transient Integer isDeleteWeaklyProperty; @Transient + @ApiParam(value ="是否为唯一约束字段") + private transient Integer isUniqueProperty; + + @Transient @ApiParam(value ="元素值") private transient Object propertyFormValue; diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementConstraint.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementConstraint.java index 3afd628..7a6ee13 100644 --- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementConstraint.java +++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementConstraint.java @@ -14,6 +14,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.Lob; import javax.persistence.Table; /** @@ -47,9 +48,10 @@ public class BfElementConstraint extends BaseBean { private Integer constraintType; @Column(name = "CONSTRAIN_PROPERTY_NAME_RDD") - @ApiParam(value = "约束属性") + @ApiParam(value = "约束属性名称") private String constrainPropertyNameRdd; + @Lob @Column(name = "CONSTRAIN_PROPERTY_IDS") @ApiParam(value = "约束属性ids") private String constrainPropertyIds; diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementProperty.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementProperty.java index 0ca9d53..569c3ed 100644 --- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementProperty.java +++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementProperty.java @@ -144,6 +144,11 @@ public class BfElementProperty extends BaseBean { @AnnoOutputColumn(hidden = true) private BfDataObjectProperty objectProperty; + @Transient + @ApiParam(value ="是否为唯一约束字段") + private transient Integer isUniqueProperty; + + // public Object getFormValue() { // return propertyFormValue == null ? propertyDefaultValue : propertyFormValue; // }