From b13c93f071cf2c47a6837339634d24fd5f4e2fc8 Mon Sep 17 00:00:00 2001 From: jiangjiazhi Date: Thu, 1 Sep 2016 17:03:39 +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 --- .../lyms/platform/operate/web/facade/ApplyOrderFacade.java | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 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 033e387..c8f3dc5 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 @@ -428,7 +428,7 @@ public class ApplyOrderFacade { referralApplyOrderQuery.setTransferredStart(DateUtil.parseYMD(str[0])); } if(str.length==2){ - referralApplyOrderQuery.setTransferredEnd(new Date(DateUtil.parseYMD(str[1]).getTime()+86398000)); + referralApplyOrderQuery.setTransferredEnd(new Date(DateUtil.parseYMD(str[1]).getTime() + 86398000)); } } @@ -438,10 +438,17 @@ public class ApplyOrderFacade { referralApplyOrderQuery.setBirthStart(DateUtil.parseYMD(str[0])); } if(str.length==2){ - referralApplyOrderQuery.setBirthEnd(new Date(DateUtil.parseYMD(str[1]).getTime()+86398000)); + referralApplyOrderQuery.setBirthEnd(new Date(DateUtil.parseYMD(str[1]).getTime() + 86398000)); } } + if(StringUtils.isNotEmpty(applyOrderQueryRequest.getYlStart())){ + referralApplyOrderQuery.setBirthEnd(DateUtil.addMonth(new Date(), -NumberUtils.toInt(applyOrderQueryRequest.getYlStart()))); + } + if(StringUtils.isNotEmpty(applyOrderQueryRequest.getYlEnd())) { + referralApplyOrderQuery.setBirthStart(DateUtil.addMonth(new Date(), -NumberUtils.toInt(applyOrderQueryRequest.getYlEnd()))); + } + List orderModels = applyOrderService.queryReferralApplyOrderWithQuery(referralApplyOrderQuery); if (CollectionUtils.isNotEmpty(orderModels)) { -- 1.8.3.1