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

epmet-module/oper-customize/oper-customize-server/src/main/resources/db/migration/V0.0.31__resi_export.sql

@@ -0,0 +1,6 @@
+alter table ic_form_item  add COLUMN EXPORT_FLAG tinyint(1) DEFAULT '0'
+    COMMENT '是否用于自定义导出显示,1展示。0不展示' AFTER DATA_ANALYSE;
+
+update ic_form_item set EXPORT_FLAG='1'
+where DEL_FLAG='0'
+  and LENGTH(COLUMN_NAME)>0;

epmet-module/oper-customize/oper-customize-server/src/main/resources/db/migration/V0.0.31__policy_flag.sql → epmet-module/oper-customize/oper-customize-server/src/main/resources/db/migration/V0.0.32__policy_flag.sql

@@ -11,9 +11,7 @@ where  DEL_FLAG='0'
 
 update ic_form_item i set i.POLICY_FLAG='1'
 where  i.DEL_FLAG='0'
-  and  i.DYNAMIC='1'
   and  i.COLUMN_NAME is not null
-  and i.COLUMN_NAME !=''
-  and i.LABEL !='出生日期'
-and  i.ITEM_TYPE not in('cascader')
-and  label not in ('分割线');
+  and  i.COLUMN_NAME !=''
+  and  i.ITEM_TYPE not in('cascader')
+  and  i.label not in ('分割线','出生日期');

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

@@ -262,6 +262,7 @@
             ITEM_GROUP_ID = #{groupId} and ifi.CUSTOMER_ID = #{customerId}
             and ifi.del_flag='0'
           AND LENGTH(ifi.COLUMN_NAME)>0
+          AND ifi.EXPORT_FLAG='1'
         ORDER BY ifi.SORT
     </select>