From c0c1c61b6ad0f901b6ca866b24cb2938e16be05b Mon Sep 17 00:00:00 2001 From: jiangjiazhi Date: Mon, 5 Sep 2016 16:55:45 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=B0=E7=94=B5=E5=AD=90?= =?UTF-8?q?=E7=97=85=E5=8E=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../platform/operate/web/facade/ApplyOrderFacade.java | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java index 8167680..477f066 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java @@ -471,13 +471,20 @@ public class ApplyOrderFacade { Date currentDate = DateUtil.formatDate(new Date()); if (StringUtils.isNotEmpty(applyOrderQueryRequest.getYlStart())) { /* Date start = DateUtil.addMonth(currentDate, -request.getMonthAgeStart()); - Date end = DateUtil.addMonth(currentDate, -request.getMonthAgeEnd()-1);*/ - Date date= DateUtil.addMonth(currentDate, -NumberUtils.toInt(applyOrderQueryRequest.getYlStart()) - 1); - date=DateUtil.addDay(date,1); + Date end = DateUtil.addMonth(currentDate, -request.getMonthAgeEnd()-1); + + + Date currentDate = DateUtil.formatDate(new Date()); + Date start = DateUtil.addMonth(currentDate, -request.getMonthAgeStart()); + Date end = DateUtil.addDay(DateUtil.addMonth(currentDate, -request.getMonthAgeEnd() - 1),1); + babyQuery.setBirthStart(end); + babyQuery.setBirthEnd(start);*/ + Date date= DateUtil.addMonth(currentDate, -NumberUtils.toInt(applyOrderQueryRequest.getYlStart())); + referralApplyOrderQuery.setBirthEnd(date); } if (StringUtils.isNotEmpty(applyOrderQueryRequest.getYlEnd())) { - referralApplyOrderQuery.setBirthStart(DateUtil.addMonth(currentDate, -NumberUtils.toInt(applyOrderQueryRequest.getYlEnd()))); + referralApplyOrderQuery.setBirthStart(DateUtil.addDay(DateUtil.addMonth(currentDate, -NumberUtils.toInt(applyOrderQueryRequest.getYlEnd())),1)); } List orderModels = applyOrderService.queryReferralApplyOrderWithQuery(referralApplyOrderQuery); -- 1.8.3.1