From ded2a4b07122a2a78f8fd28666b807a67afe9866 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Fri, 29 Oct 2021 10:48:39 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A1=A8=E5=A4=B4=E6=9F=A5=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dto/result/TableHeaderResultDTO.java      | 11 ++++------
 .../service/impl/IcFormItemServiceImpl.java   | 15 +++++++++++--
 .../main/resources/mapper/IcFormItemDao.xml   | 22 +++++++++++++++----
 3 files changed, 35 insertions(+), 13 deletions(-)

diff --git a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/result/TableHeaderResultDTO.java b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/result/TableHeaderResultDTO.java
index 08c9bd6fad..dd39f668e7 100644
--- a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/result/TableHeaderResultDTO.java
+++ b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/result/TableHeaderResultDTO.java
@@ -3,23 +3,20 @@ package com.epmet.dto.result;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.util.List;
 
 /**
- * @Description TODO
+ * @Description 表头返参DTO
  * @Author yinzuomei
  * @Date 2021/10/28 4:10 下午
  */
 @Data
 public class TableHeaderResultDTO implements Serializable {
     private static final long serialVersionUID = 8318224643897723433L;
+    private String itemId;
     private String label;
     private String columnName;
     private String itemType;
-
-    public TableHeaderResultDTO(String label,String columnName,String itemType){
-        this.label=label;
-        this.columnName=columnName;
-        this.itemType=itemType;
-    }
+    private List<OptionDTO> options;
 }
 
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 64bbd8f661..1c62d14ed7 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
@@ -21,6 +21,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.commons.tools.constant.FieldConstant;
+import com.epmet.commons.tools.constant.StrConstant;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.dao.IcFormItemDao;
@@ -33,6 +34,7 @@ import com.epmet.service.IcFormItemService;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.CollectionUtils;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -123,9 +125,18 @@ 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"));
-        list.addAll(baseDao.queryTableHeaderList(formDto.getCustomerId(),formDto.getFormCode()));
+        List<TableHeaderResultDTO> result=baseDao.queryTableHeaderList(formDto.getCustomerId(),formDto.getFormCode());
+        if(!CollectionUtils.isEmpty(result)){
+            list.addAll(result);
+        }
         //list.add(new TableHeaderResultDTO("需求分类","DEMAND_NAME","input"));
-        list.add(new TableHeaderResultDTO("房屋类型","HOUSE_TYPE","input"));
+        TableHeaderResultDTO houseType=new TableHeaderResultDTO();
+        houseType.setItemType("input");
+        houseType.setItemId(StrConstant.EPMETY_STR);
+        houseType.setColumnName("HOUSE_TYPE");
+        houseType.setLabel("房屋类型");
+        houseType.setOptions(new ArrayList<>());
+        list.add(houseType);
         return list;
     }
 
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 35bcf987dc..e369303a80 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
@@ -21,8 +21,8 @@
         <result property="columnName" column="COLUMN_NAME"/>
         <collection property="options" ofType="com.epmet.dto.result.OptionDTO"
                     column="item_id"  select="com.epmet.dao.IcFormDao.selectListOption">
-            <result property="label" column=""/>
-            <result property="value" column="url"/>
+            <result property="label" column="label"/>
+            <result property="value" column="value"/>
         </collection>
     </resultMap>
 
@@ -59,11 +59,25 @@
         ORDER BY b.SORT asc
     </select>
 
-    <select id="queryTableHeaderList" parameterType="map" resultType="com.epmet.dto.result.TableHeaderResultDTO">
+
+
+    <resultMap id="TableHeaderResultDTOMap" type="com.epmet.dto.result.TableHeaderResultDTO">
+        <id property="itemId" column="item_id" ></id>
+        <result property="label" column="LABEL"/>
+        <result property="columnName" column="COLUMN_NAME"/>
+        <result property="itemType" column="item_type"/>
+        <collection property="options" ofType="com.epmet.dto.result.OptionDTO"
+                    column="item_id"  select="com.epmet.dao.IcFormDao.selectListOption">
+            <result property="label" column="label"/>
+            <result property="value" column="value"/>
+        </collection>
+    </resultMap>
+    <select id="queryTableHeaderList" parameterType="map" resultMap="TableHeaderResultDTOMap">
         SELECT
+            m.id as item_id,
             m.LABEL,
             m.COLUMN_NAME,
-           m.item_type
+            m.item_type
         FROM
             ic_form_item m
         WHERE