Merge remote-tracking branch 'origin/dev_resi_export' into dev_resi_export

epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/entity/IcFormQueryBuilderEntity.java

@@ -72,6 +72,11 @@ public class IcFormQueryBuilderEntity extends BaseEpmetEntity {
 	 */
 	private String funType;
 
+	/**
+	 * 手机号：mobile; 身份证：id_card；只能输入数字:num
+	 */
+	private String validType;
+	
     /**
      * 排序
      */

epmet-module/oper-customize/oper-customize-server/src/main/resources/db/migration/V0.0.24__add_validtype_forbuild.sql

@@ -0,0 +1,6 @@
+alter table ic_form_query_builder add COLUMN VALID_TYPE VARCHAR(32) COMMENT '手机号：mobile; 身份证：id_card；只能输入数字:num' after FUN_TYPE;
+
+update ic_form_query_builder set VALID_TYPE=(
+select i.VALID_TYPE from ic_form_item i where i.id=FORM_ITEM_ID
+and i.CUSTOMER_ID=CUSTOMER_ID
+)where DEL_FLAG='0';

epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/IcFormItemDao.xml

@@ -77,7 +77,7 @@
             b.ITEM_TYPE,
             i.ITEM_GROUP_ID,
             i.REQUIRED,
-            IFNULL(i.VALID_TYPE,'')as VALID_TYPE,
+            IFNULL(b.VALID_TYPE,'')as VALID_TYPE,
             IFNULL(i.DEFAULT_VALUE,'') as DEFAULT_VALUE,
             IFNULL(i.OPTION_SOURCE_TYPE,'') as OPTION_SOURCE_TYPE,
             IFNULL(i.OPTION_SOURCE_VALUE,'') as OPTION_SOURCE_VALUE,