From 89443f9a9afc85a5a3fc828575777b46529669c3 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Mon, 20 Jun 2022 09:40:43 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=A1=E6=81=AF=E9=87=87=E9=9B=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epmet/dto/result/CollectListResultDTO.java  |  3 +++
 .../java/com/epmet/dao/IcResiCollectDao.java    |  2 ++
 .../main/resources/mapper/IcResiCollectDao.xml  | 17 +++++++++++------
 3 files changed, 16 insertions(+), 6 deletions(-)

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 6a23e0cc1c..0fcaa480d4 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
@@ -1,5 +1,6 @@
 package com.epmet.dto.result;
 
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -38,6 +39,8 @@ public class CollectListResultDTO implements Serializable {
      */
     private Integer totalResi;
 
+    private String domicilePlace;
+
     private List<CollectListMemberResultDTO> list;
 
 
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiCollectDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiCollectDao.java
index 547ef63ca8..db8eb3db7c 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiCollectDao.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiCollectDao.java
@@ -34,6 +34,8 @@ public interface IcResiCollectDao extends BaseDao<IcResiCollectEntity> {
      */
     List<CollectListResultDTO> getCollectList(CollectListFormDTO formDTO);
 
+    List<CollectListResultDTO.CollectListMemberResultDTO> selectMemberList(@Param("id") String id, @Param("domicilePlace") String domicilePlace);
+
     /**
      * 我上次提交的主表记录
      * @param customerId
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 1269859264..d2ca4339c1 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,16 +16,19 @@
         <result property="address" column="address"/>
         <result property="houseType" column="houseType"/>
         <result property="totalResi" column="totalResi"/>
-        <collection property="list" ofType="com.epmet.dto.result.CollectListResultDTO$CollectListMemberResultDTO" column="id" select="selectMemberList"/>
+        <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>
     <select id="getCollectList" resultMap="getCollectListMap">
         SELECT
-            c.id as id,
+            distinct c.id as id,
             c.HOUSE_HOLDER_NAME AS houseHolderName,
             c.ADDRESS AS address,
             c.HOUSE_TYPE AS houseType,
-            c.TOTAL_RESI AS totalResi
+            c.TOTAL_RESI AS totalResi,
+            #{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')
         WHERE c.DEL_FLAG = 0
         <if test='orgId != null and orgId != "" '>
             AND CONCAT(c.PIDS,':',c.AGENCY_ID) LIKE CONCAT('%',#{orgId},'%')
@@ -43,12 +46,11 @@
             AND c.id=#{id}
         </if>
         <if test='domicilePlace != null and domicilePlace != "" '>
-            AND c.DOMICILE_PLACE LIKE CONCAT('%',#{domicilePlace},'%')
+            AND m.DOMICILE_PLACE LIKE CONCAT('%',#{domicilePlace},'%')
         </if>
-
         ORDER BY c.CREATED_TIME DESC
     </select>
-    <select id="selectMemberList" resultType="com.epmet.dto.result.CollectListResultDTO$CollectListMemberResultDTO">
+    <select id="selectMemberList" parameterType="map" resultType="com.epmet.dto.result.CollectListResultDTO$CollectListMemberResultDTO">
         select
             m.`NAME` AS memberName,
             m.ID_NUM AS memberIdNum,
@@ -63,6 +65,9 @@
         from ic_resi_member m
         where m.DEL_FLAG = 0
         and m.IC_RESI_COLLECT_ID = #{id}
+        <if test='domicilePlace != null and domicilePlace != "" '>
+            AND m.DOMICILE_PLACE LIKE CONCAT('%',#{domicilePlace},'%')
+        </if>
     </select>
 
     <update id="updateRec" parameterType="map">