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 2853b48..82cdca8 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 @@ -230,34 +230,39 @@ public class SmsTemplateFacade { result.put("serviceStatusName", ServiceStatusEnums.getNameById(temp.getServiceStatus())); result.put("content", temp.getContent()); - //发送频次 - Integer sendFreq = temp.getSendFrequency(); + String str = "一次 预约短信"; + if (temp.getSmsType() != null && temp.getSmsType() != SmsServiceEnums.CJYYTX.getId() && temp.getSmsType() != SmsServiceEnums.CHFCYUTX.getId() && temp.getSmsType() != SmsServiceEnums.EBYYTX.getId()) + { + //发送频次 + Integer sendFreq = temp.getSendFrequency(); - String sendDate = SendDateEnums.getNameById(temp.getSendDateType()); + String sendDate = 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()) - { - date = DateUtil.getyyyy_MM_dd(temp.getSendDate()); - } - else if (sendFreq == SendFrequencyEnums.MONTH.getId()) + if (sendFreq != null && temp.getSendDate() != null) { - date = DateUtil.getDD(temp.getSendDate()); - } - else if (sendFreq == SendFrequencyEnums.YEAR.getId()) - { - date = DateUtil.getMMdd(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()); + } } + + String splDate = temp.getSpecialDateType() == null ? "" : SpecialDateEnums.getNameById(temp.getSpecialDateType()); + str = SendFrequencyEnums.getNameById(temp.getSendFrequency())+ " " + sendDate +" "+ date+" "+splDate+ " " +dateRange; } - String splDate = temp.getSpecialDateType() == null ? "" : SpecialDateEnums.getNameById(temp.getSpecialDateType()); - String str = SendFrequencyEnums.getNameById(temp.getSendFrequency())+ " " + sendDate +" "+ date+" "+splDate+ " " +dateRange; result.put("sendDate",str); result.put("sendTimes", SendTimeEnums.getNameById(temp.getSendTimeType()));