From 522e4bc0fe2b41d7475d9502184b441b0e76ff2a Mon Sep 17 00:00:00 2001
From: zhangyuan <zhangyuan@sarnasea.com>
Date: Wed, 25 May 2022 10:26:35 +0800
Subject: [PATCH] =?UTF-8?q?=E6=88=BF=E5=B1=8B=E9=A1=B5=E9=9D=A2=E6=9B=B4?=
 =?UTF-8?q?=E6=96=B0=E6=9F=A5=E8=AF=A2=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/epmet/dto/form/IcHouseListFormDTO.java | 9 +++++++++
 .../resources/db/migration/V0.0.20__alter_ic_house.sql   | 1 +
 .../src/main/resources/mapper/IcHouseDao.xml             | 6 ++++++
 3 files changed, 16 insertions(+)
 create mode 100644 epmet-module/gov-org/gov-org-server/src/main/resources/db/migration/V0.0.20__alter_ic_house.sql

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 b57f0bdadc..cec2d19994 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
@@ -70,4 +70,13 @@ public class IcHouseListFormDTO extends PageFormDTO {
      */
     private String sortType;
 
+    /**
+     * 房屋用途
+     */
+    private String purpose;
+
+    /**
+     * 备注
+     */
+    private String remark;
 }
diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/db/migration/V0.0.20__alter_ic_house.sql b/epmet-module/gov-org/gov-org-server/src/main/resources/db/migration/V0.0.20__alter_ic_house.sql
new file mode 100644
index 0000000000..5c2deb613e
--- /dev/null
+++ b/epmet-module/gov-org/gov-org-server/src/main/resources/db/migration/V0.0.20__alter_ic_house.sql
@@ -0,0 +1 @@
+ALTER TABLE epmet_gov_org.ic_house ADD REMARK varchar(255) NULL COMMENT '备注';
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 53d4ff2277..5fe411e6ee 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
@@ -164,6 +164,12 @@
             <if test="rentFlag != null and rentFlag.trim() != ''">
                 AND a.rent_flag = #{rentFlag}
             </if>
+            <if test="purpose != null and purpose.trim() != ''">
+                AND a.PURPOSE = #{purpose}
+            </if>
+            <if test="remark != null and remark.trim() != ''">
+                AND a.REMARK like CONCAT('%',#{remark},'%')
+            </if>
            and a.del_flag = '0'
         </where>
        #排序规则：根据小区、楼栋、单元、门牌号(分别按照数字和中文)分别升序排序