From c616bbc370fe1a0e8495a3fb3ceea9877f1bb519 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Thu, 10 Mar 2022 14:28:29 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9Eic=5Fform=5Flist=5Fitem?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/IcFormItemServiceImpl.java   |  1 +
 .../V0.0.14__create_ic_form_list_item.sql     | 22 +++++++++++++++++++
 .../main/resources/mapper/IcFormItemDao.xml   | 22 ++++++++++---------
 3 files changed, 35 insertions(+), 10 deletions(-)
 create mode 100644 epmet-module/oper-customize/oper-customize-server/src/main/resources/db/migration/V0.0.14__create_ic_form_list_item.sql

diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/IcFormItemServiceImpl.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/IcFormItemServiceImpl.java
index 79fce30efb..3a881b52d8 100644
--- a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/IcFormItemServiceImpl.java
+++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/IcFormItemServiceImpl.java
@@ -69,6 +69,7 @@ public class IcFormItemServiceImpl extends BaseServiceImpl<IcFormItemDao, IcForm
         //list.add(new TableHeaderResultDTO("楼栋","BUILD_NAME","input"));
         //list.add(new TableHeaderResultDTO("单元","UNIT_NAME","input"));
         //list.add(new TableHeaderResultDTO("所在家庭","HOME_NAME","input"));
+        //改为查询ic_form_list_item
         List<TableHeaderResultDTO> result=baseDao.queryTableHeaderList(formDto.getCustomerId(),formDto.getFormCode());
         if(!CollectionUtils.isEmpty(result)){
             list.addAll(result);
diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/resources/db/migration/V0.0.14__create_ic_form_list_item.sql b/epmet-module/oper-customize/oper-customize-server/src/main/resources/db/migration/V0.0.14__create_ic_form_list_item.sql
new file mode 100644
index 0000000000..0a894c8445
--- /dev/null
+++ b/epmet-module/oper-customize/oper-customize-server/src/main/resources/db/migration/V0.0.14__create_ic_form_list_item.sql
@@ -0,0 +1,22 @@
+CREATE TABLE `ic_form_list_item` (
+  `ID` varchar(64) NOT NULL COMMENT '主键',
+  `CUSTOMER_ID` varchar(64) NOT NULL COMMENT '客户id',
+  `FORM_ITEM_ID` varchar(64) NOT NULL COMMENT 'ic_form_item.id',
+  `FORM_CODE` varchar(64) NOT NULL COMMENT 'ic_form.form_code，举例：resi_base_info',
+  `SORT` int(11) NOT NULL COMMENT '排序',
+  `DEL_FLAG` int(10) NOT NULL COMMENT '0未删除，1已删除',
+  `REVISION` int(10) NOT NULL COMMENT '乐观锁',
+  `CREATED_BY` varchar(32) NOT NULL COMMENT '创建人',
+  `CREATED_TIME` datetime NOT NULL COMMENT '创建时间',
+  `UPDATED_BY` varchar(32) NOT NULL COMMENT '更新人',
+  `UPDATED_TIME` datetime NOT NULL COMMENT '更新时间',
+  PRIMARY KEY (`ID`) USING BTREE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='列表展示项';
+
+insert into ic_form_list_item
+select UUID(),i.CUSTOMER_ID,i.id,i.FORM_CODE,i.sort,
+'0','0','APP_USER',NOW(),'APP_USER',NOW()
+from ic_form_item i
+where i.DEL_FLAG='0'
+and i.LIST_DISPLAY='1'
+order by i.sort asc;
\ No newline at end of file
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 9af84eaee4..61ad0c8aa0 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
@@ -74,18 +74,20 @@
     </resultMap>
     <select id="queryTableHeaderList" parameterType="map" resultMap="TableHeaderResultDTOMap">
         SELECT
-            m.id as item_id,
-            m.LABEL,
-            m.COLUMN_NAME,
-            m.item_type
+            l.FORM_ITEM_ID AS item_id,
+            i.LABEL,
+            i.COLUMN_NAME,
+            I.ITEM_TYPE
         FROM
-            ic_form_item m
+            ic_form_list_item l
+            LEFT JOIN ic_form_item i
+            on(l.FORM_ITEM_ID=i.id and i.DEL_FLAG='0')
         WHERE
-            m.DEL_FLAG = '0'
-          AND m.LIST_DISPLAY = '1'
-          and m.FORM_CODE=#{formCode}
-          and m.CUSTOMER_ID=#{customerId}
-        order by m.SORT asc
+            l.CUSTOMER_ID = #{customerId}
+            AND l.DEL_FLAG = '0'
+            AND l.FORM_CODE = #{formCode}
+        ORDER BY
+            l.SORT ASC
     </select>