表单拾取功能

modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementConstraintProperty.java

@@ -1,56 +0,0 @@
-//package cn.estsh.i3plus.pojo.form.bean;
-//
-//import cn.estsh.i3plus.pojo.base.bean.BaseBean;
-//import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-//import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
-//import io.swagger.annotations.Api;
-//import io.swagger.annotations.ApiParam;
-//import lombok.Data;
-//import lombok.EqualsAndHashCode;
-//import org.hibernate.annotations.DynamicInsert;
-//import org.hibernate.annotations.DynamicUpdate;
-//
-//import javax.persistence.Column;
-//import javax.persistence.Entity;
-//import javax.persistence.Table;
-//
-///**
-// * @Description : 元素约束属性
-// * @Reference :
-// * @Author : yunhao
-// * @CreateDate : 2020-03-12 13:36
-// * @Modify:
-// **/
-//@Data
-//@Entity
-//@DynamicInsert
-//@DynamicUpdate
-//@EqualsAndHashCode(callSuper = true)
-//@Table(name = "BF_ELEMENT_CONSTRAINT_PROPERTY")
-//@Api(value = "元素约束属性", description = "元素约束属性")
-//public class BfElementConstraintProperty extends BaseBean {
-//
-//    @Column(name = "CONSTRAINT_ID")
-//    @ApiParam(value = "约束ID", example = "-1")
-//    @JsonSerialize(using = ToStringSerializer.class)
-//    private Long constraintId;
-//
-//    @Column(name = "ELEMENT_PROPERTY_ID")
-//    @ApiParam(value = "元素属性ID", example = "-1")
-//    @JsonSerialize(using = ToStringSerializer.class)
-//    private Long elementPropertyId;
-//
-//    @Column(name = "DATA_OBJECT_PROPERTY_ID")
-//    @ApiParam(value = "数据对象属性ID", example = "-1")
-//    @JsonSerialize(using = ToStringSerializer.class)
-//    private Long dataObjectPropertyId;
-//
-//    @Column(name="PROPERTY_NAME")
-//    @ApiParam(value ="元素属性名称")
-//    private String propertyName;
-//
-//    @Column(name="PROPERTY_CODE_RDD")
-//    @ApiParam(value ="元素属性代码")
-//    private String propertyCodeRdd;
-//
-//}

modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementPickUpProperty.java

@@ -0,0 +1,66 @@
+package cn.estsh.i3plus.pojo.form.bean;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+
+/**
+ * @Description : 表单拾取属性
+ * @Reference :
+ * @Author : yunhao
+ * @CreateDate : 2020-05-27 21:21
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "BF_ELEMENT_PICK_UP_PROPERTY")
+@Api(value = "表单拾取属性", description = "表单拾取属性")
+public class BfElementPickUpProperty extends BaseBean {
+
+    @Column(name = "PICK_UP_PROPERTY_ID")
+    @ApiParam(value = "拾取属性id", example = "-1")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long pickUpPropertyId;
+
+    @Column(name = "ELEMENT_ID")
+    @ApiParam(value = "对象元素ID", example = "-1")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long elementId;
+
+    @Column(name="ELEMENT_PROPERTY_ID")
+    @ApiParam(value ="元素属性id")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long elementPropertyId;
+
+    @Column(name="ELEMENT_PROPERTY_NAME")
+    @ApiParam(value ="元素属性名称")
+    private String elementPropertyName;
+
+    @Column(name = "PICK_UP_ELEMENT_ID")
+    @ApiParam(value = "拾取元素ID", example = "-1")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long pickUpElementId;
+
+    @Column(name="PICK_UP_ELEMENT_PROPERTY_ID")
+    @ApiParam(value ="拾取元素属性id")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long pickUpElementPropertyId;
+
+    @Column(name="PICK_UP_ELEMENT_PROPERTY_NAME")
+    @ApiParam(value ="拾取元素属性名称")
+    private String pickUpElementPropertyName;
+
+}

modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementProperty.java

@@ -15,6 +15,7 @@ import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
 import javax.persistence.Transient;
+import java.util.List;
 
 /**
  * @Description : 数据对象
@@ -149,6 +150,9 @@ public class BfElementProperty extends BaseBean {
     @ApiParam(value ="是否为唯一约束字段")
     private transient Integer isUniqueProperty;
 
+    @Transient
+    @ApiParam(value ="拾取关联属性")
+    private List<BfElementPickUpProperty> pickUpPropertyList;
 
 //    public Object getFormValue() {
 //        return propertyFormValue == null ? propertyDefaultValue : propertyFormValue;

modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/repository/BfElementPickUpPropertyRepository.java

@@ -0,0 +1,14 @@
+package cn.estsh.i3plus.pojo.form.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.form.bean.BfElementPickUpProperty;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : yunhao
+ * @CreateDate : 2020-05-21 15:18
+ * @Modify:
+ **/
+public interface BfElementPickUpPropertyRepository extends BaseRepository<BfElementPickUpProperty,Long> {
+}