From 9685941f8db203aa6ee90e1bfbab08afe9cb93ef Mon Sep 17 00:00:00 2001
From: wanggongfeng <1305282856@qq.com>
Date: Tue, 2 Aug 2022 17:43:57 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=A1=E6=81=AF=E9=87=87=E9=9B=86=EF=BC=8C?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/epmet/dto/result/CollectListResultDTO.java | 5 +++++
 .../src/main/resources/mapper/IcResiCollectDao.xml           | 4 +++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/CollectListResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/CollectListResultDTO.java
index 0fcaa480d4..40981fcdbd 100644
--- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/CollectListResultDTO.java
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/CollectListResultDTO.java
@@ -39,6 +39,11 @@ public class CollectListResultDTO implements Serializable {
      */
     private Integer totalResi;
 
+    /**
+     * 所属家庭Id
+     */
+    private String homeId;
+
     private String domicilePlace;
 
     private List<CollectListMemberResultDTO> list;
diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiCollectDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiCollectDao.xml
index d2ca4339c1..ea8d46a24f 100644
--- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiCollectDao.xml
+++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiCollectDao.xml
@@ -16,6 +16,7 @@
         <result property="address" column="address"/>
         <result property="houseType" column="houseType"/>
         <result property="totalResi" column="totalResi"/>
+        <result property="homeId" column="homeId"/>
         <result property="domicilePlace" column="domicilePlace"></result>
         <collection property="list" ofType="com.epmet.dto.result.CollectListResultDTO$CollectListMemberResultDTO" column="{id=id,domicilePlace=domicile_place}" select="selectMemberList"/>
     </resultMap>
@@ -26,6 +27,7 @@
             c.ADDRESS AS address,
             c.HOUSE_TYPE AS houseType,
             c.TOTAL_RESI AS totalResi,
+            c.HOME_ID as homeId,
             #{domicilePlace} as domicile_place
         FROM ic_resi_collect c
         left join ic_resi_member m on(c.id=m.IC_RESI_COLLECT_ID and m.del_flag='0')
@@ -102,4 +104,4 @@
         ORDER BY
             m.UPDATED_TIME DESC
     </select>
-</mapper>
\ No newline at end of file
+</mapper>