From c180fa373689585b59828d2c7d9ec4911f79f6d8 Mon Sep 17 00:00:00 2001 From: jiangjiazhi Date: Mon, 31 Oct 2016 10:11:40 +0800 Subject: [PATCH] =?UTF-8?q?=E5=84=BF=E7=AB=A5=E5=A2=9E=E5=8A=A0=E5=AD=97?= =?UTF-8?q?=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/lyms/platform/query/BabyModelQuery.java | 38 ++++++++++++++++++++++ .../web/controller/BabyBookbuildingController.java | 3 +- .../operate/web/facade/BabyBookbuildingFacade.java | 7 ++++ .../operate/web/request/BabyManageRequest.java | 10 ++++++ 4 files changed, 57 insertions(+), 1 deletion(-) 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 d1ea938..362bf13 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 @@ -41,6 +41,26 @@ public class BabyModelQuery extends BaseQuery implements IConvertToNativeQuery { //大于创建时间 private Date gteCreated; + private Date buildDateStart; + + private Date buildDateEnd; + + public Date getBuildDateStart() { + return buildDateStart; + } + + public void setBuildDateStart(Date buildDateStart) { + this.buildDateStart = buildDateStart; + } + + public Date getBuildDateEnd() { + return buildDateEnd; + } + + public void setBuildDateEnd(Date buildDateEnd) { + this.buildDateEnd = buildDateEnd; + } + public Date getGteModified() { return gteModified; } @@ -496,6 +516,24 @@ public class BabyModelQuery extends BaseQuery implements IConvertToNativeQuery { } isAddStart = Boolean.TRUE; } + + + if(null!=buildDateStart){ + if (null != c) { + c = c.and("buildDate").gte(buildDateStart); + } else { + c = Criteria.where("buildDate").gte(buildDateStart); + } + } + + if(null!=buildDateEnd){ + if (null != c) { + c = c.lte(buildDateEnd); + } else { + c = Criteria.where("buildDate").lte(buildDateEnd); + } + } + if (isAddStart) { return new MongoCondition(c.andOperator(condition.getCriteria())).toMongoQuery(); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyBookbuildingController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyBookbuildingController.java index 7166d7e..dd96241 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyBookbuildingController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyBookbuildingController.java @@ -177,6 +177,7 @@ public class BabyBookbuildingController extends BaseController { @RequestParam(value = "name", required = false) String name, @RequestParam(value = "highRiskType", required = false) Integer highRiskType, @RequestParam(value = "diagnose", required = false) String diagnose, + @RequestParam(value = "dateRange", required = false) String dateRange, @RequestParam("page") Integer page, @RequestParam("limit") Integer limit){ LoginContext loginState = (LoginContext) httpServletRequest.getAttribute("loginContext"); @@ -196,7 +197,7 @@ public class BabyBookbuildingController extends BaseController { request.setLimit(limit); request.setPage(page); request.setServiceStatus(serviceStatus); - + request.setDateRange(dateRange); return babyBookbuildingFacade.queryBabyList(request,loginState.getId()); } 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 90ed457..d6b7f4d 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 @@ -9,6 +9,7 @@ import com.lyms.platform.common.result.BaseListResponse; import com.lyms.platform.common.result.BaseObjectResponse; import com.lyms.platform.common.result.BaseResponse; import com.lyms.platform.common.utils.*; +import com.lyms.platform.common.utils.StringUtils; import com.lyms.platform.operate.web.request.*; import com.lyms.platform.operate.web.result.*; import com.lyms.platform.operate.web.utils.MessageCenterService; @@ -20,6 +21,7 @@ import com.lyms.platform.permission.service.UsersService; import com.lyms.platform.pojo.*; import com.lyms.platform.query.*; import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.lang.*; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.Sort; import org.springframework.stereotype.Component; @@ -1580,6 +1582,11 @@ public class BabyBookbuildingFacade { if (request.getHighRiskType() != null && request.getHighRiskType() != 2) { babyQuery.setLastHighRisk(request.getHighRiskType()); } + if(org.apache.commons.lang.StringUtils.isNotEmpty(request.getDateRange())){ + String[] dates = request.getDateRange().split(" - "); + babyQuery.setBuildDateStart(DateUtil.parseYMD(dates[0])); + babyQuery.setBuildDateEnd(DateUtil.parseYMD(dates[1])); + } List models = babyBookbuildingService.queryBabyBuildByCond(babyQuery); 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 31f8481..8bea185 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 @@ -56,6 +56,16 @@ public class BabyManageRequest extends BaseQuery { //诊断 private String diagnose; + private String dateRange; + + public String getDateRange() { + return dateRange; + } + + public void setDateRange(String dateRange) { + this.dateRange = dateRange; + } + public Integer getServiceType() { return serviceType; } -- 1.8.3.1