From b775693ead52d90c48bb4f6b1d951953ea05aedd Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Wed, 20 Jul 2022 10:03:28 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AF=BC=E5=87=BA=E7=BB=84=E4=BB=B6=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E5=88=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/resources/db/migration/V0.0.31__resi_export.sql    | 6 ++++++
 .../{V0.0.31__policy_flag.sql => V0.0.32__policy_flag.sql}  | 0
 .../src/main/resources/mapper/IcFormItemDao.xml             | 1 +
 3 files changed, 7 insertions(+)
 create mode 100644 epmet-module/oper-customize/oper-customize-server/src/main/resources/db/migration/V0.0.31__resi_export.sql
 rename epmet-module/oper-customize/oper-customize-server/src/main/resources/db/migration/{V0.0.31__policy_flag.sql => V0.0.32__policy_flag.sql} (100%)

diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/resources/db/migration/V0.0.31__resi_export.sql b/epmet-module/oper-customize/oper-customize-server/src/main/resources/db/migration/V0.0.31__resi_export.sql
new file mode 100644
index 0000000000..bb7b0964f7
--- /dev/null
+++ b/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;
\ No newline at end of file
diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/resources/db/migration/V0.0.31__policy_flag.sql b/epmet-module/oper-customize/oper-customize-server/src/main/resources/db/migration/V0.0.32__policy_flag.sql
similarity index 100%
rename from epmet-module/oper-customize/oper-customize-server/src/main/resources/db/migration/V0.0.31__policy_flag.sql
rename to epmet-module/oper-customize/oper-customize-server/src/main/resources/db/migration/V0.0.32__policy_flag.sql
diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/IcFormItemDao.xml b/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/IcFormItemDao.xml
index 689a90a30a..b0906de8d1 100644
--- a/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/IcFormItemDao.xml
+++ b/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>