Commit c81c633ebf1c9fb45aa457e116cd2ea439f10a93
1 parent
95b61a4042
Exists in
master
and in
6 other branches
update
Showing 1 changed file with 12 additions and 22 deletions
platform-msg-generate/src/main/java/com/lyms/platform/msg/worker/TempleteMsgGenerateWorker.java
View file @
c81c633
| ... | ... | @@ -527,23 +527,11 @@ |
| 527 | 527 | babyModelQuery.setBirthStart(startDate); |
| 528 | 528 | babyModelQuery.setBirthEnd(endDate); |
| 529 | 529 | |
| 530 | - if (serviceType == com.lyms.platform.common.enums.ServiceTypeEnums.ALL_SERVICE.getId() | |
| 531 | - && (serviceStatus == ServiceStatusEnums.ADD_ALL.getId() || serviceStatus == ServiceStatusEnums.ALL.getId())){ | |
| 532 | - // 全部 | |
| 533 | - List<BabyModel> babyModels = babyBookbuildingService.queryBabyBuildByCond(babyModelQuery); | |
| 534 | - for (BabyModel babyModel: babyModels){ | |
| 535 | - addBabyRemindMonthMessages(template, config, service, tempHid, sendTimeType, messages, start, end, babyModel); | |
| 536 | - } | |
| 537 | - } else { | |
| 538 | - BabyModelQuery babyQuery = getBabyModelQuery(template); | |
| 539 | - babyQuery.setBirthStart(startDate); | |
| 540 | - babyQuery.setBirthEnd(endDate); | |
| 541 | - List<BabyModel> babyModels = babyBookbuildingService.queryBabyBuildByCond(babyQuery); | |
| 542 | - for (BabyModel babyModel : babyModels){ | |
| 543 | - addBabyRemindMonthMessages(template, config, service, tempHid, sendTimeType, messages, start, end, babyModel); | |
| 544 | - } | |
| 530 | + // 全部 | |
| 531 | + List<BabyModel> babyModels = babyBookbuildingService.queryBabyBuildByCond(babyModelQuery); | |
| 532 | + for (BabyModel babyModel: babyModels){ | |
| 533 | + addBabyRemindMonthMessages(template, config, service, tempHid, sendTimeType, messages, start, end, babyModel); | |
| 545 | 534 | } |
| 546 | - | |
| 547 | 535 | } |
| 548 | 536 | |
| 549 | 537 | list.setMessages(messages); |
| ... | ... | @@ -556,7 +544,6 @@ |
| 556 | 544 | else if (smsType == SmsServiceEnums.EBYMTX.getId()) { |
| 557 | 545 | //发送频次 |
| 558 | 546 | Integer sendFreq = template.getSendFrequency(); |
| 559 | - | |
| 560 | 547 | if (sendFreq == SendFrequencyEnums.ONCE.getId()) { |
| 561 | 548 | |
| 562 | 549 | //GL(0,"公历","0,1,2","0,1,2,3"),NL(1,"农历","0,1,2","0,1,2,3"),TSRQ(2,"特殊日期","0,2","1,2,3"),SLRQ(3,"生理日期","0","1,2,3"); |
| ... | ... | @@ -584,7 +571,10 @@ |
| 584 | 571 | babyModelQuery.setBirthStart(startDate); |
| 585 | 572 | babyModelQuery.setBirthEnd(endDate); |
| 586 | 573 | |
| 587 | - babyVaccine(template, config, service, serviceType, serviceStatus, messages, start, startDate, endDate, true, babyModelQuery); | |
| 574 | + List<BabyModel> babyModels = babyBookbuildingService.queryBabyBuildByCond(babyModelQuery); | |
| 575 | + for (BabyModel babyModel: babyModels){ | |
| 576 | + addBabyVaccineDayOrMonthMessages(template, config, service, messages, start, babyModel, true); | |
| 577 | + } | |
| 588 | 578 | } |
| 589 | 579 | |
| 590 | 580 | list.setMessages(messages); |
| 591 | 581 | |
| ... | ... | @@ -607,11 +597,11 @@ |
| 607 | 597 | endDate = DateUtils.formatDate(endDate, DateUtils.Y_M_D); |
| 608 | 598 | babyModelQuery.setBirthStart(startDate); |
| 609 | 599 | babyModelQuery.setBirthEnd(endDate); |
| 610 | - System.out.println(DateUtils.getDateStr(startDate, DateUtils.Y_M_D)); | |
| 611 | - System.out.println(DateUtils.getDateStr(endDate, DateUtils.Y_M_D)); | |
| 612 | 600 | |
| 613 | - babyVaccine(template, config, service, serviceType, serviceStatus, messages, start, startDate, endDate, false, babyModelQuery); | |
| 614 | - | |
| 601 | + List<BabyModel> babyModels = babyBookbuildingService.queryBabyBuildByCond(babyModelQuery); | |
| 602 | + for (BabyModel babyModel: babyModels){ | |
| 603 | + addBabyVaccineDayOrMonthMessages(template, config, service, messages, start, babyModel, false); | |
| 604 | + } | |
| 615 | 605 | } |
| 616 | 606 | |
| 617 | 607 | list.setMessages(messages); |