From 35874ef073dc2aa38c5c440e999d3c64fc8a47cf Mon Sep 17 00:00:00 2001
From: zhangyuan <zhangyuan@sarnasea.com>
Date: Mon, 22 Aug 2022 14:07:10 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=B9=E5=96=84=E5=8E=9F=E6=9D=A5=E7=9A=84?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/epmet/dto/IcNeighborHoodDTO.java      | 5 +++++
 .../src/main/resources/mapper/IcBuildingDao.xml             | 6 ++++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcNeighborHoodDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcNeighborHoodDTO.java
index 90ec898127..67b2af7180 100644
--- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcNeighborHoodDTO.java
+++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcNeighborHoodDTO.java
@@ -149,4 +149,9 @@ public class IcNeighborHoodDTO implements Serializable {
      */
     private Integer realBuilding;
 
+    /**
+     * 楼栋名
+     */
+    private Integer buildingName;
+
 }
diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcBuildingDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcBuildingDao.xml
index 514e9a5472..8d8cc4535e 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcBuildingDao.xml
+++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcBuildingDao.xml
@@ -452,12 +452,11 @@
 
     <select id="listBuildingInfo" resultType="com.epmet.dto.result.BuildingResultDTO">
         SELECT
-        CONCAT( n.NEIGHBOR_HOOD_NAME, '-', b.BUILDING_NAME ) AS label,
+        CONCAT( n.NEIGHBOR_HOOD_NAME, b.BUILDING_NAME ) AS label,
         b.id AS buildingId,
         b.BUILDING_NAME AS buildingName,
         n.id AS neighborhoodId,
         n.NEIGHBOR_HOOD_NAME AS neighborhoodName,
-        n.CUSTOMER_ID AS neighborhoodName,
         n.GRID_ID,
         g.GRID_NAME
         FROM
@@ -472,6 +471,9 @@
         <if test="gridId != null and gridId != ''">
             AND n.GRID_ID = #{gridId}
         </if>
+        <if test="buildingName != null and buildingName != ''">
+            AND (n.NEIGHBOR_HOOD_NAME LIKE CONCAT('%', #{buildingName}, '%') OR b.BUILDING_NAME LIKE CONCAT('%', #{buildingName}, '%'))
+        </if>
         AND (
         n.AGENCY_ID = #{agencyId}
         OR n.AGENCY_PIDS LIKE CONCAT('%', #{agencyId}, '%'))