diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/ScreenCompanyDTO.java b/esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/ScreenCompanyDTO.java index 681c50eb..7780b85a 100644 --- a/esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/ScreenCompanyDTO.java +++ b/esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/ScreenCompanyDTO.java @@ -81,6 +81,11 @@ public class ScreenCompanyDTO implements Serializable { */ private Integer employedPopulation; + /** + * 房屋类型company-企业,shops-商铺,villageLiving-村居 + */ + private String houseType; + /** * 经度 */ 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/java/com/elink/esua/epdc/modules/epidemic/entity/ScreenCompanyEntity.java b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/epidemic/entity/ScreenCompanyEntity.java index d76cb7f4..1d8b5f74 100644 --- a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/epidemic/entity/ScreenCompanyEntity.java +++ b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/epidemic/entity/ScreenCompanyEntity.java @@ -78,6 +78,11 @@ public class ScreenCompanyEntity extends BaseEpdcEntity { */ private Integer employedPopulation; + /** + * 房屋类型company-企业,shops-商铺,villageLiving-村居 + */ + private String houseType; + /** * 经度 */ diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/epidemic/service/impl/ScreenCompanyServiceImpl.java b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/epidemic/service/impl/ScreenCompanyServiceImpl.java index 425723c4..5d209f99 100644 --- a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/epidemic/service/impl/ScreenCompanyServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/epidemic/service/impl/ScreenCompanyServiceImpl.java @@ -73,10 +73,10 @@ public class ScreenCompanyServiceImpl extends BaseServiceImpl getWrapper(Map params){ String companyName = (String)params.get("companyName"); - + String houseType = (String)params.get("houseType"); QueryWrapper wrapper = new QueryWrapper<>(); wrapper.like(StringUtils.isNotBlank(companyName), "COMPANY_NAME", companyName.trim()); - + wrapper.like(StringUtils.isNotBlank(houseType),"HOUSE_TYPE",houseType.trim()); return wrapper; } 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 c220b8bd..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 @@ -13,6 +13,7 @@ + @@ -31,6 +32,7 @@ c.UNIFORM_SOCIAL_CREDIT_CODE, c.REGISTERED_CAPITAL, c.EMPLOYED_POPULATION, + c.HOUSE_TYPE, c.LONGITUDE, c.LATITUDE, i.IMG_URL, @@ -49,6 +51,7 @@ + @@ -64,6 +67,7 @@ c.CONTACT_PERSON, c.MOBILE, c.COMPANY_ADDRESS, + c.HOUSE_TYPE, c.LONGITUDE, c.LATITUDE, i.IMG_URL @@ -75,6 +79,9 @@ and c.COMPANY_NAME like concat('%', #{companyName}, '%') + + and c.HOUSE_TYPE = #{houseType} + ORDER BY c.CREATED_TIME DESC LIMIT #{pageIndex},#{pageSize}