diff --git a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/DevelopmentZoneController.java b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/DevelopmentZoneController.java index 8306117fe..4b04e0c41 100644 --- a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/DevelopmentZoneController.java +++ b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/DevelopmentZoneController.java @@ -33,9 +33,9 @@ public class DevelopmentZoneController { if (pager.getCurrentPage() > 100) { pager.setCurrentPage(1); } - long countDev = developmentZoneService.countDev(model.getProvince(), model.getName(), model.getLevel()); + long countDev = developmentZoneService.countDev(model.getProvince(),model.getCityName1(), model.getName(), model.getLevel()); pager.setTotalRows((int) countDev); - List developmentZones = developmentZoneService.findDevelopmentZone(model.getProvince(), model.getName(), model.getLevel(), pager); + List developmentZones = developmentZoneService.findDevelopmentZone(model.getProvince(),model.getCityName1(), model.getName(), model.getLevel(), pager); model.setDevelopmentZoneList(developmentZones); model.setPager(pager); return model; diff --git a/projects/fangjia-bkoff/src/main/webapp/developmentZone/list.ftl b/projects/fangjia-bkoff/src/main/webapp/developmentZone/list.ftl index 84c9bed96..1830544ca 100644 --- a/projects/fangjia-bkoff/src/main/webapp/developmentZone/list.ftl +++ b/projects/fangjia-bkoff/src/main/webapp/developmentZone/list.ftl @@ -21,6 +21,9 @@ + + diff --git a/projects/fangjia-service/src/main/java/com/fangjia/service/mongo/fangjia/DevelopmentZoneService.java b/projects/fangjia-service/src/main/java/com/fangjia/service/mongo/fangjia/DevelopmentZoneService.java index 93785c053..5c04089ea 100644 --- a/projects/fangjia-service/src/main/java/com/fangjia/service/mongo/fangjia/DevelopmentZoneService.java +++ b/projects/fangjia-service/src/main/java/com/fangjia/service/mongo/fangjia/DevelopmentZoneService.java @@ -51,9 +51,9 @@ public interface DevelopmentZoneService { * @param pager * @return */ - public List findDevelopmentZone(String province,String name,String level, Pager pager); + public List findDevelopmentZone(String province,String city,String name,String level, Pager pager); - public long countDev(String province,String name,String level); + public long countDev(String province,String city ,String name,String level); public List findProvinces(); public List findCities(String province); diff --git a/projects/fangjia-service/src/main/java/com/fangjia/service/mongo/fangjia/DevelopmentZoneServiceImpl.java b/projects/fangjia-service/src/main/java/com/fangjia/service/mongo/fangjia/DevelopmentZoneServiceImpl.java index 9cc5ef376..423dbbedc 100644 --- a/projects/fangjia-service/src/main/java/com/fangjia/service/mongo/fangjia/DevelopmentZoneServiceImpl.java +++ b/projects/fangjia-service/src/main/java/com/fangjia/service/mongo/fangjia/DevelopmentZoneServiceImpl.java @@ -41,12 +41,16 @@ public class DevelopmentZoneServiceImpl implements DevelopmentZoneService { @Override - public List findDevelopmentZone(String province,String name,String level, Pager pager) { + public List findDevelopmentZone(String province,String city ,String name,String level, Pager pager) { List params = new ArrayList(); if (StringUtils.isNotBlank(province)) { Pattern pattern = Pattern.compile(".*" + province + ".*"); params.add(new QueryParam("province", pattern)); } + if (StringUtils.isNotBlank(city)) { + Pattern pattern = Pattern.compile(".*" + city + ".*"); + params.add(new QueryParam("cityName1", pattern)); + } if (StringUtils.isNotBlank(name)) { Pattern pattern = Pattern.compile(".*" + name + ".*"); @@ -61,12 +65,16 @@ public class DevelopmentZoneServiceImpl implements DevelopmentZoneService { } @Override - public long countDev(String province, String name,String level) { + public long countDev(String province,String city, String name,String level) { List params = new ArrayList(); if (StringUtils.isNotBlank(province)) { Pattern pattern = Pattern.compile(".*" + province + ".*"); params.add(new QueryParam("province", pattern)); } + if (StringUtils.isNotBlank(city)) { + Pattern pattern = Pattern.compile(".*" + city + ".*"); + params.add(new QueryParam("cityName1", pattern)); + } if (StringUtils.isNotBlank(name)) { Pattern pattern = Pattern.compile(".*" + name + ".*");