From 1b43bf529dbd13ad3566e34f275b0fa16cd28469 Mon Sep 17 00:00:00 2001
From: HAHA <HAHA@etoak.com>
Date: Thu, 2 Jun 2022 13:51:12 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A5=BC=E6=A0=8B=E7=9A=84=E6=9D=A1=E4=BB=B6?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=92=8C=E8=AF=A6=E6=83=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/epmet/opendata/dto/form/CaLoudongFormDTO.java   | 5 +++++
 .../src/main/java/com/epmet/opendata/dao/CaLoudongDao.java   | 3 ++-
 .../epmet/opendata/service/impl/CaLoudongServiceImpl.java    | 2 +-
 .../src/main/resources/mapper/CaLoudongDao.xml               | 3 +++
 4 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/form/CaLoudongFormDTO.java b/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/form/CaLoudongFormDTO.java
index a027ab6492..0822a5fcf1 100644
--- a/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/form/CaLoudongFormDTO.java
+++ b/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/form/CaLoudongFormDTO.java
@@ -15,6 +15,11 @@ public class CaLoudongFormDTO  implements Serializable {
      */
     private String communityName;
 
+    /**
+     * 楼宇名字
+     */
+    private String buildingName;
+
     private Integer page;
     private Integer limit;
 
diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/CaLoudongDao.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/CaLoudongDao.java
index 27c2774580..c1b44056dd 100644
--- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/CaLoudongDao.java
+++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/CaLoudongDao.java
@@ -32,7 +32,8 @@ public interface CaLoudongDao extends BaseDao<CaLoudongEntity> {
      * @author LZN
      * @date 2022/5/31 18:57
      */
-    List<CaLoudongResultDTO> getPage(@Param("communityName") String communityName);
+    List<CaLoudongResultDTO> getPage(@Param("communityName") String communityName,
+                                     @Param("buildingName") String buildingName);
 
     /**
      * 楼栋基本信息详情
diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/CaLoudongServiceImpl.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/CaLoudongServiceImpl.java
index c75e1874a4..067fc1dd85 100644
--- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/CaLoudongServiceImpl.java
+++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/CaLoudongServiceImpl.java
@@ -107,7 +107,7 @@ public class CaLoudongServiceImpl extends BaseServiceImpl<CaLoudongDao, CaLoudon
     @Override
     public PageData<CaLoudongResultDTO> getPage(CaLoudongFormDTO dto) {
         PageHelper.startPage(dto.getPage(), dto.getLimit());
-        List<CaLoudongResultDTO> result = baseDao.getPage(dto.getCommunityName());
+        List<CaLoudongResultDTO> result = baseDao.getPage(dto.getCommunityName(),dto.getBuildingName());
         PageInfo<CaLoudongResultDTO> info = new PageInfo<>(result);
         return new PageData<>(result, info.getTotal());
     }
diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/CaLoudongDao.xml b/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/CaLoudongDao.xml
index 907fb4628f..fac929e4d5 100644
--- a/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/CaLoudongDao.xml
+++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/CaLoudongDao.xml
@@ -90,6 +90,9 @@
             <if test="communityName != null and communityName != ''">
                 AND community_name = #{communityName}
             </if>
+            <if test="buildingName != null and buildingName != ''">
+                AND building_name = #{buildingName}
+            </if>
         </where>
     </select>
     <select id="getLouDongDetails" resultType="com.epmet.opendata.dto.result.CaLoudongDetailsResultDTO">