Commit d87eb0b9124ae98b368b2ff66eac7552117292d4
Exists in
master
and in
1 other branch
Merge remote-tracking branch 'origin/master'
Showing 1 changed file
platform-common/src/main/java/com/lyms/platform/common/utils/DateUtil.java
View file @
d87eb0b
| ... | ... | @@ -479,7 +479,7 @@ |
| 479 | 479 | c2.setTime(date2); |
| 480 | 480 | |
| 481 | 481 | result = c2.get(Calendar.MONDAY) - c1.get(Calendar.MONTH); |
| 482 | - if (result < 0) | |
| 482 | + if (result <= 0) | |
| 483 | 483 | { |
| 484 | 484 | result = 12 - Math.abs(result); |
| 485 | 485 | } |
| 486 | 486 | |
| ... | ... | @@ -651,11 +651,11 @@ |
| 651 | 651 | // String st = md.format(new Date()); |
| 652 | 652 | // System.out.print(st); |
| 653 | 653 | |
| 654 | -// String s = getBabyMonthAge(parseYMD("2014-07-9"), new Date()); | |
| 655 | -// System.out.println(s); | |
| 654 | + String s = getBabyMonthAge(parseYMD("2015-08-19"), new Date()); | |
| 655 | + System.out.println(s); | |
| 656 | 656 | |
| 657 | - Date s = addDay(parseYMD("2016-02-26"), 168); | |
| 658 | - System.out.println(getyyyy_MM_dd(s)); | |
| 657 | +// Date s = addDay(parseYMD("2016-02-26"), 168); | |
| 658 | +// System.out.println(getyyyy_MM_dd(s)); | |
| 659 | 659 | } catch (Exception e) |
| 660 | 660 | { |
| 661 | 661 |