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 4443365..4dda1f9 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 @@ -523,7 +523,7 @@ public class DateUtil { }else if(type.equals("天".trim())){ rightNow.add(Calendar.DAY_OF_YEAR,num); } - rightNow.add(Calendar.DAY_OF_YEAR,delayDay); + rightNow.add(Calendar.DAY_OF_YEAR, delayDay); String date = y_m_d.format(rightNow.getTime()); System.out.println(date); return rightNow.getTime(); @@ -550,6 +550,13 @@ public class DateUtil { return rightNow.getTime(); } + public static Date formatDate(Date date) + { + String time = y_m_d.format(date); + return parseYMD(time); + } + + public static void main(String[] arg) { /* Date today = new Date(1448336360000L); @@ -559,8 +566,8 @@ public class DateUtil { System.out.println(new DateTime().minusDays(77));*/ // System.out.println(getDaySeconds()); - String s = getBabyMonthAge(parseYMD("2016-05-16"), new Date()); - System.out.println(s); +// String s = getBabyMonthAge(parseYMD("2016-05-16"), new Date()); +// System.out.println(s); // SimpleDateFormat simpleDateFormat=new SimpleDateFormat("yyyy-MM-dd "); // System.out.println(getBabyAgeMonth(parseYMD("2016-05-23"), new Date())); // System.out.println(DateUtil.getyyyy_MM_dd_hms(DateUtil.addDay(new Date(),-108))); @@ -574,9 +581,11 @@ public class DateUtil { // Date startDate = DateUtil.addDay(new Date(), 2); // System.out.println(getyyyy_MM_dd(startDate)); try { -// Date d = md.parse("07-02"); -// Date startDate = DateUtil.addDay(d, -2); -// System.out.println(dd.format(startDate)); + + Date startDate = DateUtil.addMonth(new Date(), -1); + Date endtDate = DateUtil.addMonth(new Date(), -2); + System.out.println(y_m_d_h_m_s.format(startDate)); + System.out.println(y_m_d_h_m_s.format(endtDate)); // Date sendDate = dd.parse("02"); // String md = DateUtil.getMMdd(new Date()); 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 50bd459..565b6da 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 @@ -1278,8 +1278,9 @@ public class BabyBookbuildingFacade { babyQuery.setMphone(request.getMphone()); if (request.getMonthAgeStart() != null && request.getMonthAgeEnd() != null) { - Date start = DateUtil.addMonth(new Date(), -request.getMonthAgeStart()); - Date end = DateUtil.addMonth(new Date(), -request.getMonthAgeEnd()); + Date currentDate = DateUtil.formatDate(new Date()); + Date start = DateUtil.addMonth(currentDate, -request.getMonthAgeStart()); + Date end = DateUtil.addMonth(currentDate, -request.getMonthAgeEnd()-1); babyQuery.setBirthStart(end); babyQuery.setBirthEnd(start); }