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 e19afac..95bdd60 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 @@ -379,7 +379,7 @@ public class DateUtil { int day = daysBetween(birth,checkDate); return day+"天"; } - + rightNow = Calendar.getInstance(); rightNow.setTime(checkDate); rightNow.add(Calendar.MONTH,1); rightNow.add(Calendar.YEAR,-1); @@ -390,16 +390,21 @@ public class DateUtil { Calendar yearNow = Calendar.getInstance(); - yearNow.setTime(checkDate); - yearNow.add(Calendar.MONTH,-month); + yearNow.setTime(birth); + yearNow.add(Calendar.MONTH,month); - int day = daysBetween(birth,yearNow.getTime()); + int day = daysBetween(yearNow.getTime(),checkDate); String dstr = ""; if (day != 0) { dstr=day+"天"; } - return month+"月龄"+dstr; + String ms = ""; + if (month != 0) + { + ms = month+"月龄"; + } + return ms+dstr; } int year = getYearSpace(birth, checkDate); rightNow.setTime(checkDate); @@ -554,9 +559,10 @@ public class DateUtil { System.out.println(new DateTime().minusDays(77));*/ // System.out.println(getDaySeconds()); -// int s = getBabyAgeMonth(parseYMD("2016-05-26"), new Date()); + String s = getBabyMonthAge(parseYMD("2016-06-26"), 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(getBabyAgeMonth(parseYMD("2016-05-23"), new Date())); // System.out.println(DateUtil.getyyyy_MM_dd_hms(DateUtil.addDay(new Date(),-108))); // System.out.println(DateUtil.getyyyy_MM_dd_hms(DateUtil.addDay(new Date(), -146))); // System.out.print(1457688652-23341); @@ -572,14 +578,14 @@ public class DateUtil { // Date startDate = DateUtil.addDay(d, -2); // System.out.println(dd.format(startDate)); - Date sendDate = dd.parse("02"); - String md = DateUtil.getMMdd(new Date()); - String str = md +"-"+DateUtil.getDD(sendDate); - Date d = DateUtil.parseYMD(str); - - Date actualSendDate = DateUtil.addDay(d, -2); - String sendDateStr = DateUtil.getDD(actualSendDate); - System.out.println(sendDateStr); +// Date sendDate = dd.parse("02"); +// String md = DateUtil.getMMdd(new Date()); +// String str = md +"-"+DateUtil.getDD(sendDate); +// Date d = DateUtil.parseYMD(str); +// +// Date actualSendDate = DateUtil.addDay(d, -2); +// String sendDateStr = DateUtil.getDD(actualSendDate); +// System.out.println(sendDateStr); } catch (Exception e) {