From 3a0d23a91d3d8330000684b9712c57c700459b86 Mon Sep 17 00:00:00 2001
From: zhangyuan <zhangyuan@sarnasea.com>
Date: Fri, 19 Aug 2022 14:18:49 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=B9=E4=B8=BA=E5=B0=8F=E5=8C=BA-=E6=A5=BC?=
 =?UTF-8?q?=E6=A0=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/epmet/dao/IcNeighborHoodDao.java | 23 +++++++++++++
 .../impl/IcNeighborHoodServiceImpl.java       | 15 +--------
 .../resources/mapper/IcNeighborHoodDao.xml    | 33 +++++++++++++++++++
 3 files changed, 57 insertions(+), 14 deletions(-)

diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcNeighborHoodDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcNeighborHoodDao.java
index a1999a0ee6..a25bb785ef 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcNeighborHoodDao.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcNeighborHoodDao.java
@@ -18,6 +18,7 @@
 package com.epmet.dao;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.commons.tools.dto.result.OptionResultDTO;
 import com.epmet.dto.IcNeighborHoodDTO;
 import com.epmet.dto.ImportGeneralDTO;
 import com.epmet.dto.NeighborHoodAndManagementDTO;
@@ -211,4 +212,26 @@ public interface IcNeighborHoodDao extends BaseDao<IcNeighborHoodEntity> {
      * @Date 2022/6/29 16:48
      */
     List<HomeListResultDTO> getHouseList(HouseInformationFormDTO formDTO);
+
+    /**
+     * 小区-楼栋列表
+     *
+     * @param formDTO
+     * @return java.util.List<com.epmet.commons.tools.dto.result.OptionResultDTO>
+     * @author zhy
+     * @date 2022/8/19 14:01
+     */
+    List<OptionResultDTO> getNeighborhoodBuildingList(IcNeighborHoodDTO formDTO);
+
+
+    /**
+     * 楼栋列表
+     *
+     * @param formDTO
+     * @return java.util.List<com.epmet.commons.tools.dto.result.OptionResultDTO>
+     * @author zhy
+     * @date 2022/8/19 14:01
+     */
+    List<OptionResultDTO> selectBuildingList(IcNeighborHoodDTO formDTO);
+
 }
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcNeighborHoodServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcNeighborHoodServiceImpl.java
index bbc85379ad..2ddc07a897 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcNeighborHoodServiceImpl.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcNeighborHoodServiceImpl.java
@@ -221,20 +221,7 @@ public class IcNeighborHoodServiceImpl extends BaseServiceImpl<IcNeighborHoodDao
             }
             dto.setAgencyId(result.getAgencyId());
         }
-        LambdaQueryWrapper<IcNeighborHoodEntity> wrapper = new LambdaQueryWrapper<>();
-        wrapper.eq(StringUtils.isNotBlank(dto.getAgencyId()),IcNeighborHoodEntity::getAgencyId, dto.getAgencyId());
-        wrapper.eq(StringUtils.isNotBlank(dto.getGridId()), IcNeighborHoodEntity::getGridId, dto.getGridId());
-        wrapper.last("ORDER BY CONVERT ( NEIGHBOR_HOOD_NAME USING gbk ) ASC");
-        List<IcNeighborHoodEntity> list = baseDao.selectList(wrapper);
-        if(CollectionUtils.isEmpty(list)) {
-            return Collections.emptyList();
-        }
-        return list.stream().map(item -> {
-            OptionResultDTO result = new OptionResultDTO();
-            result.setValue(item.getId());
-            result.setLabel(item.getNeighborHoodName());
-            return result;
-        }).collect(Collectors.toList());
+        return baseDao.getNeighborhoodBuildingList(dto);
     }
 
     /**
diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcNeighborHoodDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcNeighborHoodDao.xml
index 2f76bc1b7a..603947caf1 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcNeighborHoodDao.xml
+++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcNeighborHoodDao.xml
@@ -25,6 +25,15 @@
         <result property="updatedTime" column="UPDATED_TIME"/>
     </resultMap>
 
+    <resultMap id="neighborhoodBuildingMap" type="com.epmet.commons.tools.dto.result.OptionResultDTO">
+        <id column="value" property="value" />
+        <result column="label" property="label"/>
+        <collection property="children" column="value" ofType="com.epmet.commons.tools.dto.result.OptionResultDTO" select="selectBuildingList">
+            <id column="value" property="value" />
+            <result column="label" property="label" />
+        </collection>
+    </resultMap>
+
     <!-- 更新小区详细地址和备注 -->
     <update id="updateNeighborHood">
         update ic_neighbor_hood
@@ -663,5 +672,29 @@
             SORT, DOOR_NAME+0
     </select>
 
+    <select id="getNeighborhoodBuildingList" resultMap="neighborhoodBuildingMap">
+        SELECT
+            id AS 'value',
+            NEIGHBOR_HOOD_NAME AS label
+        FROM
+            ic_neighbor_hood
+        WHERE
+            DEL_FLAG = '0'
+          AND CUSTOMER_ID = #{customerId}
+          AND (
+                    AGENCY_ID = #{agencyId}
+                OR AGENCY_PIDS LIKE CONCAT('%', #{agencyId}, '%'))
+    </select>
+
+    <select id="selectBuildingList" parameterType="map" resultType="com.epmet.commons.tools.dto.result.OptionResultDTO">
+        SELECT
+            id AS 'value',
+            BUILDING_NAME AS label
+        FROM
+            ic_building
+        WHERE
+            DEL_FLAG = '0'
+          AND NEIGHBOR_HOOD_ID = #{value}
+    </select>
 
 </mapper>