表单功能优化，虚拟属性连表查询，时间格式化对接

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockFormEnumUtil.java

@@ -3,6 +3,8 @@ package cn.estsh.i3plus.pojo.base.enumutil;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import org.apache.commons.lang3.StringUtils;
 
+import java.util.Date;
+
 /**
  * @Description : 模块表单枚举类
  * @Reference :
@@ -831,7 +833,7 @@ public class BlockFormEnumUtil {
         TEXT(200, "TEXT", "文本"),
         NUMBER(210, "NUMBER", "数字"),
         PASSWORD(230, "PASSWORD", "密码"),
-        DATE(300, "DATE", "日期"),
+        DATE_TIME(300, "DATE", "日期"),
 //        DATE(300, "DATE", "日期(yyyy-MM-dd)"),
 //        DATE_TIME(310, "DATE_TIME", "时间(yyyy-MM-dd hh:mm:ss)"),
         //        ELEMENT(700, "DICT_SELECT", "元素"),
@@ -1164,16 +1166,16 @@ public class BlockFormEnumUtil {
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum PROPERTY_TYPE {
-        STRING(10, "String", "字符串", "java.lang.String", String.class,PROPERTY_CONTROL_TYPE.TEXT,SQL_WHERE.LIKE,null),
+        STRING(10, "String", "字符串", "java.lang.String", String.class,PROPERTY_CONTROL_TYPE.TEXT,SQL_WHERE.LIKE,""),
-        CHAR(11, "Character", "单字符", "java.lang.Character", Character.class,PROPERTY_CONTROL_TYPE.TEXT,SQL_WHERE.EQUAL,null),
+        CHAR(11, "Character", "单字符", "java.lang.Character", Character.class,PROPERTY_CONTROL_TYPE.TEXT,SQL_WHERE.EQUAL,""),
-        INTEGER(20, "Integer", "短整型", "java.lang.Integer", Integer.class,PROPERTY_CONTROL_TYPE.NUMBER,SQL_WHERE.EQUAL,null),
+        INTEGER(20, "Integer", "短整型", "java.lang.Integer", Integer.class,PROPERTY_CONTROL_TYPE.NUMBER,SQL_WHERE.EQUAL,"0"),
-        LONG(21, "Long", "长整型", "java.lang.Long", Long.class,PROPERTY_CONTROL_TYPE.NUMBER,SQL_WHERE.EQUAL,null),
+        LONG(21, "Long", "长整型", "java.lang.Long", Long.class,PROPERTY_CONTROL_TYPE.NUMBER,SQL_WHERE.EQUAL,"0"),
-        DOUBLE(30, "Double", "大浮点型", "java.lang.Double", Double.class,PROPERTY_CONTROL_TYPE.NUMBER,SQL_WHERE.EQUAL,null),
+        DOUBLE(30, "Double", "大浮点型", "java.lang.Double", Double.class,PROPERTY_CONTROL_TYPE.NUMBER,SQL_WHERE.EQUAL,"0.0"),
-        FLOAT(31, "Float", "小浮点型", "java.lang.Float", Float.class,PROPERTY_CONTROL_TYPE.NUMBER,SQL_WHERE.EQUAL,null),
+        FLOAT(31, "Float", "小浮点型", "java.lang.Float", Float.class,PROPERTY_CONTROL_TYPE.NUMBER,SQL_WHERE.EQUAL,"0.0"),
-        BIG_DECIMAL(32, "Double", "大浮点型", "java.math.BigDecimal", Double.class,PROPERTY_CONTROL_TYPE.NUMBER,SQL_WHERE.EQUAL,null),
+        BIG_DECIMAL(32, "Double", "大浮点型", "java.math.BigDecimal", Double.class,PROPERTY_CONTROL_TYPE.NUMBER,SQL_WHERE.EQUAL,"0.0"),
         BOOLEAN(40, "Boolean", "布尔值", "java.lang.Boolean", Boolean.class,PROPERTY_CONTROL_TYPE.RADIO,SQL_WHERE.EQUAL,null),
-        BYTE(50, "Byte", "字节", "java.lang.Byte", Byte.class,PROPERTY_CONTROL_TYPE.TEXT,SQL_WHERE.EQUAL,null);
+        BYTE(50, "Byte", "字节", "java.lang.Byte", Byte.class,PROPERTY_CONTROL_TYPE.TEXT,SQL_WHERE.EQUAL,null),
-//        DATE(60, "Date", "日期", "java.lang.String", String.class,PROPERTY_CONTROL_TYPE.DATE_TIME,null);
+        DATE_TIME(12, "String", "日期时分秒", "java.sql.Timestamp", String.class,PROPERTY_CONTROL_TYPE.DATE_TIME,SQL_WHERE.BETWEEN,null,"yyyy-MM-dd hh:mm:ss");
 
         /**
          * 属性类型值
@@ -1206,11 +1208,28 @@ public class BlockFormEnumUtil {
         private SQL_WHERE defaultWhere;
 
         /**
+         * 默认 格式化 方式
+         */
+        private String defaultFormat;
+
+        /**
          * 默认查询关系
          */
         private String defaultValue;
 
-        private PROPERTY_TYPE(int value, String code, String description,String classPath,Class clzFullName,PROPERTY_CONTROL_TYPE controlType,SQL_WHERE defaultWhere,String defaultValue) {
+        private PROPERTY_TYPE(int value, String code, String description,String classPath,Class clzFullName,
+                              PROPERTY_CONTROL_TYPE controlType,SQL_WHERE defaultWhere) {
+            this.value = value;
+            this.code = code;
+            this.description = description;
+            this.classPath = classPath;
+            this.clzFullName = clzFullName;
+            this.controlType = controlType;
+            this.defaultWhere = defaultWhere;
+        }
+
+        private PROPERTY_TYPE(int value, String code, String description,String classPath,Class clzFullName,
+                              PROPERTY_CONTROL_TYPE controlType,SQL_WHERE defaultWhere,String defaultValue) {
             this.value = value;
             this.code = code;
             this.description = description;
@@ -1219,6 +1238,20 @@ public class BlockFormEnumUtil {
             this.controlType = controlType;
             this.defaultWhere = defaultWhere;
             this.defaultValue = defaultValue;
+            this.defaultFormat = defaultFormat;
+        }
+
+        private PROPERTY_TYPE(int value, String code, String description,String classPath,Class clzFullName,
+                              PROPERTY_CONTROL_TYPE controlType,SQL_WHERE defaultWhere,String defaultValue,String defaultFormat) {
+            this.value = value;
+            this.code = code;
+            this.description = description;
+            this.classPath = classPath;
+            this.clzFullName = clzFullName;
+            this.controlType = controlType;
+            this.defaultWhere = defaultWhere;
+            this.defaultValue = defaultValue;
+            this.defaultFormat = defaultFormat;
         }
 
         public int getValue() {
@@ -1249,6 +1282,14 @@ public class BlockFormEnumUtil {
             return defaultWhere;
         }
 
+        public String getDefaultFormat() {
+            return defaultFormat;
+        }
+
+        public String getDefaultValue() {
+            return defaultValue;
+        }
+
         public static String valueOfCode(int val) {
             String tmp = null;
             for (int i = 0; i < values().length; i++) {
@@ -2379,7 +2420,8 @@ public class BlockFormEnumUtil {
         LIKE(7, "LIKE", "全模糊"),
         START_LIKE(7, "LIKE", "前模糊"),
         END_LIKE(7, "LIKE", "后模糊"),
-        IN(8, "in", "in");
+        IN(8, "in", "in"),
+        BETWEEN(9, "BETWEEN", "区间查询(逗号区分)"),;
 
         private int value;
         private String code;