From c81c633ebf1c9fb45aa457e116cd2ea439f10a93 Mon Sep 17 00:00:00 2001 From: liquanyu Date: Fri, 29 Jan 2021 18:08:51 +0800 Subject: [PATCH] update --- .../msg/worker/TempleteMsgGenerateWorker.java | 34 ++++++++-------------- 1 file changed, 12 insertions(+), 22 deletions(-) diff --git a/platform-msg-generate/src/main/java/com/lyms/platform/msg/worker/TempleteMsgGenerateWorker.java b/platform-msg-generate/src/main/java/com/lyms/platform/msg/worker/TempleteMsgGenerateWorker.java index 8a430d9..d7417c9 100644 --- a/platform-msg-generate/src/main/java/com/lyms/platform/msg/worker/TempleteMsgGenerateWorker.java +++ b/platform-msg-generate/src/main/java/com/lyms/platform/msg/worker/TempleteMsgGenerateWorker.java @@ -527,23 +527,11 @@ public class TempleteMsgGenerateWorker implements Runnable { babyModelQuery.setBirthStart(startDate); babyModelQuery.setBirthEnd(endDate); - if (serviceType == com.lyms.platform.common.enums.ServiceTypeEnums.ALL_SERVICE.getId() - && (serviceStatus == ServiceStatusEnums.ADD_ALL.getId() || serviceStatus == ServiceStatusEnums.ALL.getId())){ - // 全部 - List babyModels = babyBookbuildingService.queryBabyBuildByCond(babyModelQuery); - for (BabyModel babyModel: babyModels){ - addBabyRemindMonthMessages(template, config, service, tempHid, sendTimeType, messages, start, end, babyModel); - } - } else { - BabyModelQuery babyQuery = getBabyModelQuery(template); - babyQuery.setBirthStart(startDate); - babyQuery.setBirthEnd(endDate); - List babyModels = babyBookbuildingService.queryBabyBuildByCond(babyQuery); - for (BabyModel babyModel : babyModels){ - addBabyRemindMonthMessages(template, config, service, tempHid, sendTimeType, messages, start, end, babyModel); - } + // 全部 + List babyModels = babyBookbuildingService.queryBabyBuildByCond(babyModelQuery); + for (BabyModel babyModel: babyModels){ + addBabyRemindMonthMessages(template, config, service, tempHid, sendTimeType, messages, start, end, babyModel); } - } list.setMessages(messages); @@ -556,7 +544,6 @@ public class TempleteMsgGenerateWorker implements Runnable { else if (smsType == SmsServiceEnums.EBYMTX.getId()) { //发送频次 Integer sendFreq = template.getSendFrequency(); - if (sendFreq == SendFrequencyEnums.ONCE.getId()) { //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 @@ public class TempleteMsgGenerateWorker implements Runnable { babyModelQuery.setBirthStart(startDate); babyModelQuery.setBirthEnd(endDate); - babyVaccine(template, config, service, serviceType, serviceStatus, messages, start, startDate, endDate, true, babyModelQuery); + List babyModels = babyBookbuildingService.queryBabyBuildByCond(babyModelQuery); + for (BabyModel babyModel: babyModels){ + addBabyVaccineDayOrMonthMessages(template, config, service, messages, start, babyModel, true); + } } list.setMessages(messages); @@ -607,11 +597,11 @@ public class TempleteMsgGenerateWorker implements Runnable { endDate = DateUtils.formatDate(endDate, DateUtils.Y_M_D); babyModelQuery.setBirthStart(startDate); babyModelQuery.setBirthEnd(endDate); - System.out.println(DateUtils.getDateStr(startDate, DateUtils.Y_M_D)); - System.out.println(DateUtils.getDateStr(endDate, DateUtils.Y_M_D)); - - babyVaccine(template, config, service, serviceType, serviceStatus, messages, start, startDate, endDate, false, babyModelQuery); + List babyModels = babyBookbuildingService.queryBabyBuildByCond(babyModelQuery); + for (BabyModel babyModel: babyModels){ + addBabyVaccineDayOrMonthMessages(template, config, service, messages, start, babyModel, false); + } } list.setMessages(messages); -- 1.8.3.1