From 10046358341fef557ff2322e7ee57ff85a5ca8e2 Mon Sep 17 00:00:00 2001 From: liquanyu Date: Fri, 5 Aug 2016 14:56:47 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A8=A1=E6=9D=BF=E6=97=A5=E6=9C=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../operate/web/facade/SmsTemplateFacade.java | 42 +++++++++++++++------- 1 file changed, 30 insertions(+), 12 deletions(-) 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()); -- 1.8.3.1