From 99c55e8de55c37c9d15ab690fec83b56536714eb Mon Sep 17 00:00:00 2001
From: zhangfh <jyyzzfh@126.com>
Date: Thu, 9 Sep 2021 09:27:00 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B5=8E=E5=8D=97=E9=94=A6=E6=B0=B4-=E7=BB=99?=
 =?UTF-8?q?=E5=A4=A7=E5=B1=8F=E6=8F=90=E4=BE=9B=E7=9A=84=E4=BC=81=E4=B8=9A?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=E6=9F=A5=E8=AF=A2=E6=8E=A5=E5=8F=A3=E6=9B=B4?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../esua/epdc/dto/form/EpdcScreenCompanyListFormDTO.java     | 5 +++++
 .../esua/epdc/dto/result/EpdcScreenCompanyListResultDTO.java | 5 +++++
 .../src/main/resources/mapper/epidemic/ScreenCompanyDao.xml  | 5 +++++
 3 files changed, 15 insertions(+)

diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/form/EpdcScreenCompanyListFormDTO.java b/esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/form/EpdcScreenCompanyListFormDTO.java
index 289f9d8d..1b2c19a9 100644
--- a/esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/form/EpdcScreenCompanyListFormDTO.java
+++ b/esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/form/EpdcScreenCompanyListFormDTO.java
@@ -26,4 +26,9 @@ public class EpdcScreenCompanyListFormDTO implements Serializable {
      * 企业名称
      */
     private String companyName;
+
+    /**
+     * 房屋类型
+     */
+    private String houseType;
 }
diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/result/EpdcScreenCompanyListResultDTO.java b/esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/result/EpdcScreenCompanyListResultDTO.java
index ecf78574..fb5dc438 100644
--- a/esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/result/EpdcScreenCompanyListResultDTO.java
+++ b/esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/result/EpdcScreenCompanyListResultDTO.java
@@ -40,6 +40,11 @@ public class EpdcScreenCompanyListResultDTO implements Serializable {
      */
     private String companyAddress;
 
+    /**
+     * 房屋类型
+     */
+    private String houseType;
+
     /**
      * 经度
      */
diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/resources/mapper/epidemic/ScreenCompanyDao.xml b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/resources/mapper/epidemic/ScreenCompanyDao.xml
index 37a8dc0c..fa2d38cc 100644
--- a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/resources/mapper/epidemic/ScreenCompanyDao.xml
+++ b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/resources/mapper/epidemic/ScreenCompanyDao.xml
@@ -51,6 +51,7 @@
         <result property="companyIntroduction" column="COMPANY_INTRODUCTION"/>
         <result property="contactPerson" column="CONTACT_PERSON"/>
         <result property="mobile" column="MOBILE"/>
+        <result property="houseType" column="HOUSE_TYPE"/>
         <result property="companyAddress" column="COMPANY_ADDRESS"/>
         <result property="longitude" column="LONGITUDE"/>
         <result property="latitude" column="LATITUDE"/>
@@ -66,6 +67,7 @@
             c.CONTACT_PERSON,
             c.MOBILE,
             c.COMPANY_ADDRESS,
+            c.HOUSE_TYPE,
             c.LONGITUDE,
             c.LATITUDE,
             i.IMG_URL
@@ -77,6 +79,9 @@
         <if test="companyName != null and companyName != ''">
             and c.COMPANY_NAME like concat('%', #{companyName}, '%')
         </if>
+        <if test="houseType != null and houseType != ''">
+            and c.HOUSE_TYPE = #{houseType}
+        </if>
         ORDER BY c.CREATED_TIME DESC
         LIMIT #{pageIndex},#{pageSize}
     </select>