From 3e54828d11cc27c75e28041f3399506e2328ab9b Mon Sep 17 00:00:00 2001 From: liquanyu Date: Mon, 19 Jun 2017 14:51:33 +0800 Subject: [PATCH] update code --- .../main/java/com/lyms/platform/query/BabyModelQuery.java | 12 ++++++++++++ .../platform/operate/web/controller/BabyBuildController.java | 4 ++++ .../platform/operate/web/facade/BabyBookbuildingFacade.java | 2 ++ .../lyms/platform/operate/web/request/BabyManageRequest.java | 10 ++++++++++ 4 files changed, 28 insertions(+) diff --git a/platform-dal/src/main/java/com/lyms/platform/query/BabyModelQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/BabyModelQuery.java index 9595719..1a44511 100644 --- a/platform-dal/src/main/java/com/lyms/platform/query/BabyModelQuery.java +++ b/platform-dal/src/main/java/com/lyms/platform/query/BabyModelQuery.java @@ -209,6 +209,15 @@ public class BabyModelQuery extends BaseQuery implements IConvertToNativeQuery { private String provinceId; private String cityId; + private String streetId; + + public String getStreetId() { + return streetId; + } + + public void setStreetId(String streetId) { + this.streetId = streetId; + } public String getProvinceId() { return provinceId; @@ -558,6 +567,9 @@ public class BabyModelQuery extends BaseQuery implements IConvertToNativeQuery { if (null != areaId) { condition = condition.and("areaId", areaId, MongoOper.IS); } + if (null != streetId) { + condition = condition.and("streetId", streetId, MongoOper.IS); + } if (null != enable) { condition = condition.and("enable", enable, MongoOper.IS); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyBuildController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyBuildController.java index 9f88d13..02e6ea3 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyBuildController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyBuildController.java @@ -204,6 +204,7 @@ public class BabyBuildController extends BaseController { @RequestParam(value = "provinceId",required = false) String provinceId, @RequestParam(value = "cityId",required = false) String cityId, @RequestParam(value = "areaId",required = false) String areaId, + @RequestParam(value = "streetId",required = false) String streetId, @RequestParam(value = "hospitalProvinceId",required = false) String hospitalProvinceId, @RequestParam(value = "hospitalCityId",required = false) String hospitalCityId, @RequestParam(value = "hospitalAreaId",required = false) String hospitalAreaId, @@ -236,6 +237,7 @@ public class BabyBuildController extends BaseController { request.setCityId(cityId); // 区/县 request.setAreaId(areaId); + request.setStreetId(streetId); // 建档医院 request.setHospitalProvinceId(hospitalProvinceId); request.setHospitalCityId(hospitalCityId); @@ -272,6 +274,7 @@ public class BabyBuildController extends BaseController { @RequestParam(value = "provinceId",required = false) String provinceId, @RequestParam(value = "cityId",required = false) String cityId, @RequestParam(value = "areaId",required = false) String areaId, + @RequestParam(value = "streetId",required = false) String streetId, @RequestParam(value = "hospitalProvinceId",required = false) String hospitalProvinceId, @RequestParam(value = "hospitalCityId",required = false) String hospitalCityId, @RequestParam(value = "hospitalAreaId",required = false) String hospitalAreaId, @@ -303,6 +306,7 @@ public class BabyBuildController extends BaseController { request.setCityId(cityId); // 区/县 request.setAreaId(areaId); + request.setStreetId(streetId); // 建档医院 request.setHospitalProvinceId(hospitalProvinceId); request.setHospitalCityId(hospitalCityId); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java index e33be6a..d590442 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java @@ -2070,6 +2070,8 @@ public class BabyBookbuildingFacade { babyQuery.setCityId(StringUtils.isEmpty(request.getCityId())?null:request.getCityId()); // 区/县 babyQuery.setAreaId(StringUtils.isEmpty(request.getAreaId())?null:request.getAreaId()); + + babyQuery.setStreetId(StringUtils.isEmpty(request.getStreetId()) ? null : request.getStreetId()); babyQuery.setQueryNo(request.getQueryNo()); List models = babyBookbuildingService.queryBabyBuildByCond(babyQuery, "modified", Sort.Direction.DESC); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyManageRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyManageRequest.java index 0ce5332..81878f8 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyManageRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyManageRequest.java @@ -64,6 +64,8 @@ public class BabyManageRequest extends BaseQuery { private String areaId; + private String streetId; + private String hospitalProvinceId; private String hospitalCityId; @@ -82,6 +84,14 @@ public class BabyManageRequest extends BaseQuery { //查询号 private String queryNo; + public String getStreetId() { + return streetId; + } + + public void setStreetId(String streetId) { + this.streetId = streetId; + } + public String getQueryNo() { return queryNo; } -- 1.8.3.1