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 90112a4..6ce21ca 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 @@ -72,21 +72,22 @@ public class SmsTemplateFacade { model.setContent(request.getContent()); - if (request.getSendFrequency() == SendFrequencyEnums.ONCE.getId()) + if (request.getSendFrequency() != null) { - model.setSendDate(DateUtil.parseYMD(request.getSendDate())); - } - else if (request.getSendFrequency() == SendFrequencyEnums.MONTH.getId()) - { - model.setSendDate(DateUtil.parseD(request.getSendDate())); - } - else if (request.getSendFrequency() == SendFrequencyEnums.YEAR.getId()) - { - model.setSendDate(DateUtil.parseMD(request.getSendDate())); + if (request.getSendFrequency() == SendFrequencyEnums.ONCE.getId()) + { + model.setSendDate(DateUtil.parseYMD(request.getSendDate())); + } + else if (request.getSendFrequency() == SendFrequencyEnums.MONTH.getId()) + { + model.setSendDate(DateUtil.parseD(request.getSendDate())); + } + else if (request.getSendFrequency() == SendFrequencyEnums.YEAR.getId()) + { + model.setSendDate(DateUtil.parseMD(request.getSendDate())); + } } - - model.setSendDateType(request.getSendDateType()); model.setSendFrequency(request.getSendFrequency()); model.setServiceObj(request.getServiceObj()); @@ -140,6 +141,23 @@ public class SmsTemplateFacade { result.setId(model.getId()); result.setContent(model.getContent()); + + if (model.getSendFrequency() != null) + { + if (model.getSendFrequency() == SendFrequencyEnums.ONCE.getId()) + { + result.setSendDate(DateUtil.getyyyy_MM_dd(model.getSendDate())); + } + else if (model.getSendFrequency() == SendFrequencyEnums.MONTH.getId()) + { + result.setSendDate(DateUtil.getMMdd(model.getSendDate())); + } + else if (model.getSendFrequency() == SendFrequencyEnums.YEAR.getId()) + { + result.setSendDate(DateUtil.getDD(model.getSendDate())); + } + } + result.setSendDate(DateUtil.getyyyy_MM_dd(model.getSendDate())); result.setSendDateType(model.getSendDateType());