shiyang / regional-platform

Download as
Browse Code »

Commit a16b1b2a7bb7fa0dce1b6f2731c2a0e4f224af3f

Authored by liquanyu
1 parent 3e0cd722f7
Exists in master and in 1 other branch nobuildprocess

模板日期

Showing 2 changed files with 45 additions and 5 deletions

platform-common/src/main/java/com/lyms/platform/common/utils/DateUtil.java View file @ a16b1b2
... ... @@ -176,6 +176,29 @@
176 176 }
177 177 }
178 178  
  179 +
  180 + public static Date parseMD(String s) {
  181 + if (s == null) {
  182 + return null;
  183 + }
  184 + try {
  185 + return md.parse(s);
  186 + } catch (Exception e) {
  187 + return null;
  188 + }
  189 + }
  190 +
  191 + public static Date parseD(String s) {
  192 + if (s == null) {
  193 + return null;
  194 + }
  195 + try {
  196 + return dd.parse(s);
  197 + } catch (Exception e) {
  198 + return null;
  199 + }
  200 + }
  201 +
179 202 public static String getyyyy_MM_dd(Date d) {
180 203 if (d == null) {
181 204 return null;
... ... @@ -586,10 +609,13 @@
586 609 // System.out.println(getyyyy_MM_dd(startDate));
587 610 try {
588 611  
589   - Date startDate = DateUtil.addMonth(new Date(), -1);
590   - Date endtDate = DateUtil.addMonth(new Date(), -2);
591   - System.out.println(y_m_d_h_m_s.format(startDate));
592   - System.out.println(y_m_d_h_m_s.format(endtDate));
  612 +// Date startDate = DateUtil.addMonth(new Date(), -1);
  613 +// Date endtDate = DateUtil.addMonth(new Date(), -2);
  614 +// System.out.println(y_m_d_h_m_s.format(startDate));
  615 +// System.out.println(y_m_d_h_m_s.format(endtDate));
  616 +
  617 + Date d = parseD("7");
  618 + System.out.print(getDD(d));
593 619  
594 620 // Date sendDate = dd.parse("02");
595 621 // String md = DateUtil.getMMdd(new Date());
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SmsTemplateFacade.java View file @ a16b1b2
... ... @@ -71,7 +71,21 @@
71 71 model.setYn(YnEnums.YES.getId());
72 72  
73 73 model.setContent(request.getContent());
74   - model.setSendDate(DateUtil.parseYMD(request.getSendDate()));
  74 +
  75 + if (request.getSendFrequency() == SendFrequencyEnums.ONCE.getId())
  76 + {
  77 + model.setSendDate(DateUtil.parseYMD(request.getSendDate()));
  78 + }
  79 + else if (request.getSendFrequency() == SendFrequencyEnums.MONTH.getId())
  80 + {
  81 + model.setSendDate(DateUtil.parseD(request.getSendDate()));
  82 + }
  83 + else if (request.getSendFrequency() == SendFrequencyEnums.YEAR.getId())
  84 + {
  85 + model.setSendDate(DateUtil.parseMD(request.getSendDate()));
  86 + }
  87 +
  88 +
75 89  
76 90 model.setSendDateType(request.getSendDateType());
77 91 model.setSendFrequency(request.getSendFrequency());