From 206719d304c3f7cfead8213c5785cc2d69b58645 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Mon, 24 Oct 2022 18:09:07 +0800
Subject: [PATCH] =?UTF-8?q?=E6=88=BF=E5=B1=8B=E5=88=97=E8=A1=A8=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E5=85=A5=E5=8F=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epmet/dto/form/IcHouseListFormDTO.java    | 30 ++++++++++++++-----
 .../src/main/resources/mapper/IcHouseDao.xml  |  6 ++++
 2 files changed, 28 insertions(+), 8 deletions(-)

diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/IcHouseListFormDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/IcHouseListFormDTO.java
index 4c32424b09..e2022b1420 100644
--- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/IcHouseListFormDTO.java
+++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/IcHouseListFormDTO.java
@@ -16,6 +16,28 @@ public class IcHouseListFormDTO extends PageFormDTO {
 
     private static final long serialVersionUID = -1L;
 
+    /**
+     * 10.24需求http://zentao.elinkservice.cn/story-view-710.html
+     * 小区id
+     */
+    private String neighborHoodId;
+    /**
+     * 10.24需求http://zentao.elinkservice.cn/story-view-710.html
+     * 新增楼栋id
+     */
+    private String buildingId;
+    /**
+     * 10.24需求http://zentao.elinkservice.cn/story-view-710.html
+     * 新增单元id
+     */
+    private String buildingUnitId;
+    /**
+     * 10.24需求http://zentao.elinkservice.cn/story-view-710.html
+     * 新增：房号
+     */
+    private String houseId;
+
+
     /**
      * 组织类别
      */
@@ -51,14 +73,6 @@ public class IcHouseListFormDTO extends PageFormDTO {
      * 房屋状态 【1：出租 0：自住  2：闲置 3:未出售】
      */
     private String rentFlag;
-    /**
-     * 楼栋ID
-     */
-    private String buildingId;
-    /**
-     * 小区ID
-     */
-    private String neighborHoodId;
 
     /**
      * 搜索关键词，社区查询，搜索输入的关键词
diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml
index 6e417b0aed..441dfe7f1b 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml
+++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml
@@ -147,6 +147,12 @@
             <if test="neighborHoodId != null and neighborHoodId != ''">
                 AND a.NEIGHBOR_HOOD_ID = #{neighborHoodId}
             </if>
+            <if test="buildingUnitId != null and buildingUnitId != ''">
+                AND a.BUILDING_UNIT_ID = #{buildingUnitId}
+            </if>
+            <if test="houseId != null and houseId != ''">
+                AND a.ID = #{houseId}
+            </if>
             <if test='level == "building"'>
                 AND b.id = #{id}
             </if>