From b6da709c27e1131c573f23d18151f415a051e036 Mon Sep 17 00:00:00 2001 From: zhangfh Date: Wed, 8 Sep 2021 17:53:57 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=B5=8E=E5=8D=97=E9=94=A6=E6=B0=B4-?= =?UTF-8?q?=E5=A4=A7=E5=B1=8F=E4=BC=81=E4=B8=9A=E7=AE=A1=E7=90=86=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=E5=AE=8C=E5=96=84=EF=BC=88=E5=90=8E=E7=AB=AF=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=E6=8F=90=E4=BA=A4=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/elink/esua/epdc/dto/ScreenCompanyDTO.java | 5 +++++ .../epdc/modules/epidemic/entity/ScreenCompanyEntity.java | 5 +++++ .../epidemic/service/impl/ScreenCompanyServiceImpl.java | 4 ++-- .../src/main/resources/mapper/epidemic/ScreenCompanyDao.xml | 2 ++ 4 files changed, 14 insertions(+), 2 deletions(-) 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-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..37a8dc0c 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, From 99c55e8de55c37c9d15ab690fec83b56536714eb Mon Sep 17 00:00:00 2001 From: zhangfh Date: Thu, 9 Sep 2021 09:27:00 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=B5=8E=E5=8D=97=E9=94=A6=E6=B0=B4-?= =?UTF-8?q?=E7=BB=99=E5=A4=A7=E5=B1=8F=E6=8F=90=E4=BE=9B=E7=9A=84=E4=BC=81?= =?UTF-8?q?=E4=B8=9A=E4=BF=A1=E6=81=AF=E6=9F=A5=E8=AF=A2=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E6=9B=B4=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 @@ + @@ -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}