From b335557d6a5b26316063a81a811d57fe03459514 Mon Sep 17 00:00:00 2001 From: liquanyu Date: Sun, 7 Aug 2016 10:29:39 +0800 Subject: [PATCH] =?UTF-8?q?=E7=9F=AD=E4=BF=A1=E6=A8=A1=E6=9D=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../operate/web/facade/SmsTemplateFacade.java | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 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 9e4f56d..77a1a92 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 @@ -241,13 +241,27 @@ public class SmsTemplateFacade { String dateRange = temp.getStart() == null ? "" : (temp.getStart() + " "+ temp.getEnd()); - String date = temp.getSendDate() == null ? "" : DateUtil.getyyyy_MM_dd(temp.getSendDate()); + String date = ""; + + if (sendFreq != null) + { + 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()); String 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 ) ? "未启用" : "启用"); -- 1.8.3.1