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)) {