Merge remote-tracking branch 'origin/dev' into test

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

@@ -1,6 +1,8 @@
 package cn.estsh.i3plus.pojo.form.bean;
 
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.base.enumutil.BlockFormEnumUtil;
 import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
@@ -8,6 +10,7 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.ColumnDefault;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
 
@@ -53,9 +56,16 @@ public class BfDataObjectProperty extends BaseBean {
     private String objectColumnName;
 
     // 暂用来区分存储过程出入参数信息
-    @Column(name="OTHER_COLUMN_TYPE")
-    @ApiParam(value ="其他列类型")
-    private Integer otherColumnType;
+    @AnnoOutputColumn(refClass = BlockFormEnumUtil.ORIGIN_PROPERTY_TYPE.class)
+    @ColumnDefault("10")
+    @Column(name="ORIGIN_PROPERTY_TYPE")
+    @ApiParam(value ="原始列类型")
+    private Integer originPropertyType;
+
+    public String getOriginPropertyTypeTxt() {
+        return originPropertyType == null ? BlockFormEnumUtil.ORIGIN_PROPERTY_TYPE.NORMAL_PROPERTY.getDescription()
+                : BlockFormEnumUtil.ORIGIN_PROPERTY_TYPE.valueOfDescription(originPropertyType);
+    }
 
     @Column(name="OBJECT_COLUMN_TYPE")
     @ApiParam(value ="数据对象类型")
@@ -74,7 +84,7 @@ public class BfDataObjectProperty extends BaseBean {
     private Integer isNullable;
 
     public Integer getIsNullableVal(){
-        return isNullable == null ? CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue() : isNullable.intValue();
+        return isNullable == null ? CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue() : isNullable;
     }
 
     // 字段长度

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

@@ -30,6 +30,8 @@ import javax.persistence.Table;
 @Api(value = "表单拾取属性", description = "表单拾取属性")
 public class BfElementPickUpProperty extends BaseBean {
 
+    private static final long serialVersionUID = -1071243642582327905L;
+
     @Column(name = "PICK_UP_PROPERTY_ID")
     @ApiParam(value = "拾取属性id", example = "-1")
     @JsonSerialize(using = ToStringSerializer.class)

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

@@ -2,12 +2,14 @@ package cn.estsh.i3plus.pojo.form.bean;
 
 import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.base.enumutil.BlockFormEnumUtil;
 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.ColumnDefault;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
 
@@ -49,6 +51,18 @@ public class BfElementProperty extends BaseBean {
     @JsonSerialize(using = ToStringSerializer.class)
     private Long dataObjectPropertyId;
 
+    // 暂用来区分存储过程出入参数信息
+    @AnnoOutputColumn(refClass = BlockFormEnumUtil.ORIGIN_PROPERTY_TYPE.class)
+    @ColumnDefault("10")
+    @Column(name="ORIGIN_PROPERTY_TYPE")
+    @ApiParam(value ="原始列类型")
+    private Integer originPropertyType;
+
+    public String getOriginPropertyTypeTxt() {
+        return originPropertyType == null ? BlockFormEnumUtil.ORIGIN_PROPERTY_TYPE.NORMAL_PROPERTY.getDescription()
+                : BlockFormEnumUtil.ORIGIN_PROPERTY_TYPE.valueOfDescription(originPropertyType);
+    }
+
     @Column(name="PROPERTY_TYPE")
     @ApiParam(value ="属性类型")
     private Integer propertyType;

modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/SqlColumnModel.java

@@ -1,5 +1,7 @@
 package cn.estsh.i3plus.pojo.model.form;
 
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
+import cn.estsh.i3plus.pojo.base.enumutil.BlockFormEnumUtil;
 import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
@@ -43,6 +45,18 @@ public class SqlColumnModel implements Serializable {
     // 字段精确长度
     @ApiParam(value = "字段精确长度")
     private Integer scale;
+
+    // 暂用来区分存储过程出入参数信息
+    // 暂用来区分存储过程出入参数信息
+    @AnnoOutputColumn(refClass = BlockFormEnumUtil.ORIGIN_PROPERTY_TYPE.class)
+    @ApiParam(value ="原始列类型")
+    private Integer originPropertyType;
+
+    public String getOriginPropertyTypeTxt() {
+        return originPropertyType == null ? BlockFormEnumUtil.ORIGIN_PROPERTY_TYPE.NORMAL_PROPERTY.getDescription()
+                : BlockFormEnumUtil.ORIGIN_PROPERTY_TYPE.valueOfDescription(originPropertyType);
+    }
+
     // 字段类型编号
     @ApiParam(value = "字段类型编号")
     private Integer columnType;

modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/SqlProcedureColumnModel.java

@@ -1,5 +1,7 @@
 package cn.estsh.i3plus.pojo.model.form;
 
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
+import cn.estsh.i3plus.pojo.base.enumutil.BlockFormEnumUtil;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
 
@@ -32,6 +34,7 @@ public class SqlProcedureColumnModel {
      * 4是出参
      * 5是返回值（函数）
      */
+    @AnnoOutputColumn(refClass = BlockFormEnumUtil.PROCEDURE_COL_TYPE.class)
     @ApiParam(value = "列类型")
     private Integer columnType;
 
@@ -41,6 +44,10 @@ public class SqlProcedureColumnModel {
     @ApiParam(value = "数据类型名称")
     private String typeName;
 
+    // 字段Java 类型
+    @ApiParam(value = "字段Java 类型")
+    private String className;
+
     @ApiParam(value = "长度")
     private Integer length;