Commit 27d1d8877013607fed0886076cf3cdd3739a632f
1 parent
b0dd403eca
Exists in
master
and in
6 other branches
update code
Showing 2 changed files with 9 additions and 2 deletions
platform-msg-generate/src/main/java/com/lyms/platform/msg/utils/DateUtils.java
View file @
27d1d88
| ... | ... | @@ -230,5 +230,11 @@ |
| 230 | 230 | } |
| 231 | 231 | return Math.abs(result); |
| 232 | 232 | } |
| 233 | + public static void main(String[] args) { | |
| 234 | + Date startDate = DateUtils.getNewDate(new Date(), -1 - 1, "月", 1); | |
| 235 | + Date endDate = DateUtils.getNewDate(new Date(), -1, "月",2); | |
| 236 | + System.out.println(DateUtils.getDateStr(startDate, Y_M_D)); | |
| 237 | + System.out.println(DateUtils.getDateStr(endDate,Y_M_D)); | |
| 238 | + } | |
| 233 | 239 | } |
platform-msg-generate/src/main/java/com/lyms/platform/msg/worker/TempleteMsgGenerateWorker.java
View file @
27d1d88
| ... | ... | @@ -487,12 +487,13 @@ |
| 487 | 487 | if (start != null && end != null) |
| 488 | 488 | { |
| 489 | 489 | Date startDate = DateUtils.getNewDate(new Date(),-end-1, "月", sendTimeType); |
| 490 | - Date endDate = DateUtils.getNewDate(new Date(),-start,"月",sendTimeType); | |
| 490 | + Date endDate = DateUtils.getNewDate(new Date(),-start,"月",sendTimeType+1); | |
| 491 | 491 | startDate = DateUtils.formatDate(startDate, DateUtils.Y_M_D); |
| 492 | 492 | endDate = DateUtils.formatDate(endDate,DateUtils.Y_M_D); |
| 493 | 493 | babyModelQuery.setBirthStart(startDate); |
| 494 | 494 | babyModelQuery.setBirthEnd(endDate); |
| 495 | - | |
| 495 | + System.out.println(DateUtils.getDateStr(startDate, DateUtils.Y_M_D)); | |
| 496 | + System.out.println(DateUtils.getDateStr(endDate,DateUtils.Y_M_D)); | |
| 496 | 497 | List<BabyModel> babyModels = babyBookbuildingService.queryBabyBuildByCond(babyModelQuery); |
| 497 | 498 | if (CollectionUtils.isNotEmpty(babyModels)) |
| 498 | 499 | { |