From 53b2e1c6fc754caf69d55fdc2d1ed7f3f851611b Mon Sep 17 00:00:00 2001 From: "litao@lymsh.com" Date: Tue, 29 Aug 2017 16:49:45 +0800 Subject: [PATCH] =?UTF-8?q?=E6=94=B9=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/lyms/platform/common/utils/DateUtil.java | 2 +- .../lyms/platform/operate/web/facade/BabyCheckFacade.java | 14 ++++++++++++++ 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/platform-common/src/main/java/com/lyms/platform/common/utils/DateUtil.java b/platform-common/src/main/java/com/lyms/platform/common/utils/DateUtil.java index e749ca2..742d5cf 100644 --- a/platform-common/src/main/java/com/lyms/platform/common/utils/DateUtil.java +++ b/platform-common/src/main/java/com/lyms/platform/common/utils/DateUtil.java @@ -1104,7 +1104,7 @@ public class DateUtil { * @return */ public static Date getBirthStart(Integer end) { - return getMonth(-end); + return getMonth(-end - 1); } public static Date getBirthEnd(Integer start) { return addDay(getMonth(-start), 1); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java index ff44f35..160dfc9 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java @@ -501,6 +501,20 @@ public class BabyCheckFacade { //查询儿童的基本信息 List models = babyBookbuildingService.queryBabyBuildByCond(babyQuery); + Date lastDate = null; + for (BabyModel b : models) { + if(lastDate == null) { + lastDate = b.getCreated(); + } else { + if (b.getCreated() != null && lastDate.getTime() < b.getCreated().getTime()) { + lastDate = b.getCreated(); + } + } + } + if(lastDate != null) { + resMap.put("lastDate", DateUtil.getyyyy_MM_dd(lastDate)); + } + if (CollectionUtils.isNotEmpty(models)) { -- 1.8.3.1