diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SmsTemplateFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SmsTemplateFacade.java index 4700b99..ccba4e3 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SmsTemplateFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SmsTemplateFacade.java @@ -266,41 +266,45 @@ public class SmsTemplateFacade { && temp.getSmsType() != SmsServiceEnums.CJGQTX.getId() ) { - //发送频次 - Integer sendFreq = temp.getSendFrequency(); + if (temp.getSmsType() == SmsServiceEnums.FWDGTX.getId()) + { + str ="一次" +((temp.getHealthType() == null || temp.getHealthType() == 0 ) ? "健康" : "高危") + " " + + ((temp.getTemplateType() == null || temp.getTemplateType() == 0 ) ? "推送" : "短信"); + } + else + { + //发送频次 + Integer sendFreq = temp.getSendFrequency(); - String sendDate = temp.getSendDateType() == null ? "" : SendDateEnums.getNameById(temp.getSendDateType()); + String sendDate = temp.getSendDateType() == null ? "" : SendDateEnums.getNameById(temp.getSendDateType()); - String dateRange = temp.getStart() == null ? "" : (temp.getStart() + " "+ temp.getEnd()); + String dateRange = temp.getStart() == null ? "" : (temp.getStart() + " "+ temp.getEnd()); - String date = ""; + String date = ""; - if (sendFreq != null && temp.getSendDate() != null) - { - if (sendFreq == SendFrequencyEnums.ONCE.getId()) + if (sendFreq != null && temp.getSendDate() != null) { - date = DateUtil.getyyyy_MM_dd(temp.getSendDate()); + if (sendFreq == SendFrequencyEnums.ONCE.getId()) + { + date = DateUtil.getyyyy_MM_dd(temp.getSendDate()); + } + else if (sendFreq == SendFrequencyEnums.MONTH.getId()) + { + date = DateUtil.getDD(temp.getSendDate()); + } + else if (sendFreq == SendFrequencyEnums.YEAR.getId()) + { + date = DateUtil.getMMdd(temp.getSendDate()); + } } - else if (sendFreq == SendFrequencyEnums.MONTH.getId()) - { - date = DateUtil.getDD(temp.getSendDate()); - } - else if (sendFreq == SendFrequencyEnums.YEAR.getId()) - { - date = DateUtil.getMMdd(temp.getSendDate()); - } - } - String splDate = temp.getSpecialDateType() == null ? "" : SpecialDateEnums.getNameById(temp.getSpecialDateType()); - str = SendFrequencyEnums.getNameById(temp.getSendFrequency())+ " " + sendDate +" "+ date+" "+splDate+ " " +dateRange; - } - else if (temp.getSmsType() == SmsServiceEnums.FWDGTX.getId()) - { - str ="一次" +((temp.getHealthType() == null || temp.getHealthType() == 0 ) ? "健康" : "高危") + " " - + ((temp.getTemplateType() == null || temp.getTemplateType() == 0 ) ? "推送" : "短信"); + String splDate = temp.getSpecialDateType() == null ? "" : SpecialDateEnums.getNameById(temp.getSpecialDateType()); + str = SendFrequencyEnums.getNameById(temp.getSendFrequency())+ " " + sendDate +" "+ date+" "+splDate+ " " +dateRange; + } } + result.put("sendDate",str); result.put("sendTimes", SendTimeEnums.getNameById(temp.getSendTimeType())); result.put("status",(temp.getStatus() == null || temp.getStatus() == 0 ) ? "未启用" : "启用");