From a16b1b2a7bb7fa0dce1b6f2731c2a0e4f224af3f Mon Sep 17 00:00:00 2001 From: liquanyu Date: Fri, 5 Aug 2016 14:50:53 +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 --- .../com/lyms/platform/common/utils/DateUtil.java | 34 +++++++++++++++++++--- .../operate/web/facade/SmsTemplateFacade.java | 16 +++++++++- 2 files changed, 45 insertions(+), 5 deletions(-) diff --git a/platform-common/src/main/java/com/lyms/platform/common/utils/DateUtil.java b/platform-common/src/main/java/com/lyms/platform/common/utils/DateUtil.java index 26dd4ae..74f3818 100644 --- a/platform-common/src/main/java/com/lyms/platform/common/utils/DateUtil.java +++ b/platform-common/src/main/java/com/lyms/platform/common/utils/DateUtil.java @@ -176,6 +176,29 @@ public class DateUtil { } } + + public static Date parseMD(String s) { + if (s == null) { + return null; + } + try { + return md.parse(s); + } catch (Exception e) { + return null; + } + } + + public static Date parseD(String s) { + if (s == null) { + return null; + } + try { + return dd.parse(s); + } catch (Exception e) { + return null; + } + } + public static String getyyyy_MM_dd(Date d) { if (d == null) { return null; @@ -586,10 +609,13 @@ public class DateUtil { // System.out.println(getyyyy_MM_dd(startDate)); try { - Date startDate = DateUtil.addMonth(new Date(), -1); - Date endtDate = DateUtil.addMonth(new Date(), -2); - System.out.println(y_m_d_h_m_s.format(startDate)); - System.out.println(y_m_d_h_m_s.format(endtDate)); +// Date startDate = DateUtil.addMonth(new Date(), -1); +// Date endtDate = DateUtil.addMonth(new Date(), -2); +// System.out.println(y_m_d_h_m_s.format(startDate)); +// System.out.println(y_m_d_h_m_s.format(endtDate)); + + Date d = parseD("7"); + System.out.print(getDD(d)); // Date sendDate = dd.parse("02"); // String md = DateUtil.getMMdd(new Date()); 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 46de4fd..90112a4 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 @@ -71,7 +71,21 @@ public class SmsTemplateFacade { model.setYn(YnEnums.YES.getId()); model.setContent(request.getContent()); - model.setSendDate(DateUtil.parseYMD(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()); -- 1.8.3.1