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 @@ + @@ -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 @@ and c.COMPANY_NAME like concat('%', #{companyName}, '%') + + and c.HOUSE_TYPE = #{houseType} + ORDER BY c.CREATED_TIME DESC LIMIT #{pageIndex},#{pageSize}