Commit 53b2e1c6fc754caf69d55fdc2d1ed7f3f851611b
1 parent
a781bcb6c5
Exists in
master
and in
6 other branches
改字段
Showing 2 changed files with 15 additions and 1 deletions
platform-common/src/main/java/com/lyms/platform/common/utils/DateUtil.java
View file @
53b2e1c
| ... | ... | @@ -1104,7 +1104,7 @@ |
| 1104 | 1104 | * @return |
| 1105 | 1105 | */ |
| 1106 | 1106 | public static Date getBirthStart(Integer end) { |
| 1107 | - return getMonth(-end); | |
| 1107 | + return getMonth(-end - 1); | |
| 1108 | 1108 | } |
| 1109 | 1109 | public static Date getBirthEnd(Integer start) { |
| 1110 | 1110 | return addDay(getMonth(-start), 1); |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java
View file @
53b2e1c
| ... | ... | @@ -501,6 +501,20 @@ |
| 501 | 501 | |
| 502 | 502 | //查询儿童的基本信息 |
| 503 | 503 | List<BabyModel> models = babyBookbuildingService.queryBabyBuildByCond(babyQuery); |
| 504 | + Date lastDate = null; | |
| 505 | + for (BabyModel b : models) { | |
| 506 | + if(lastDate == null) { | |
| 507 | + lastDate = b.getCreated(); | |
| 508 | + } else { | |
| 509 | + if (b.getCreated() != null && lastDate.getTime() < b.getCreated().getTime()) { | |
| 510 | + lastDate = b.getCreated(); | |
| 511 | + } | |
| 512 | + } | |
| 513 | + } | |
| 514 | + if(lastDate != null) { | |
| 515 | + resMap.put("lastDate", DateUtil.getyyyy_MM_dd(lastDate)); | |
| 516 | + } | |
| 517 | + | |
| 504 | 518 | |
| 505 | 519 | if (CollectionUtils.isNotEmpty(models)) { |
| 506 | 520 |