Commit af3814e49d853070f033361388d6f04ab05946a6
Exists in
master
and in
1 other branch
Merge remote-tracking branch 'origin/master'
Showing 2 changed files
platform-common/src/main/java/com/lyms/platform/common/utils/DateUtil.java
View file @
af3814e
| ... | ... | @@ -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 @
af3814e
| ... | ... | @@ -71,8 +71,23 @@ |
| 71 | 71 | model.setYn(YnEnums.YES.getId()); |
| 72 | 72 | |
| 73 | 73 | model.setContent(request.getContent()); |
| 74 | - model.setSendDate(DateUtil.parseYMD(request.getSendDate())); | |
| 75 | 74 | |
| 75 | + if (request.getSendFrequency() != null) | |
| 76 | + { | |
| 77 | + if (request.getSendFrequency() == SendFrequencyEnums.ONCE.getId()) | |
| 78 | + { | |
| 79 | + model.setSendDate(DateUtil.parseYMD(request.getSendDate())); | |
| 80 | + } | |
| 81 | + else if (request.getSendFrequency() == SendFrequencyEnums.MONTH.getId()) | |
| 82 | + { | |
| 83 | + model.setSendDate(DateUtil.parseD(request.getSendDate())); | |
| 84 | + } | |
| 85 | + else if (request.getSendFrequency() == SendFrequencyEnums.YEAR.getId()) | |
| 86 | + { | |
| 87 | + model.setSendDate(DateUtil.parseMD(request.getSendDate())); | |
| 88 | + } | |
| 89 | + } | |
| 90 | + | |
| 76 | 91 | model.setSendDateType(request.getSendDateType()); |
| 77 | 92 | model.setSendFrequency(request.getSendFrequency()); |
| 78 | 93 | model.setServiceObj(request.getServiceObj()); |
| ... | ... | @@ -126,6 +141,23 @@ |
| 126 | 141 | result.setId(model.getId()); |
| 127 | 142 | |
| 128 | 143 | result.setContent(model.getContent()); |
| 144 | + | |
| 145 | + if (model.getSendFrequency() != null) | |
| 146 | + { | |
| 147 | + if (model.getSendFrequency() == SendFrequencyEnums.ONCE.getId()) | |
| 148 | + { | |
| 149 | + result.setSendDate(DateUtil.getyyyy_MM_dd(model.getSendDate())); | |
| 150 | + } | |
| 151 | + else if (model.getSendFrequency() == SendFrequencyEnums.MONTH.getId()) | |
| 152 | + { | |
| 153 | + result.setSendDate(DateUtil.getMMdd(model.getSendDate())); | |
| 154 | + } | |
| 155 | + else if (model.getSendFrequency() == SendFrequencyEnums.YEAR.getId()) | |
| 156 | + { | |
| 157 | + result.setSendDate(DateUtil.getDD(model.getSendDate())); | |
| 158 | + } | |
| 159 | + } | |
| 160 | + | |
| 129 | 161 | result.setSendDate(DateUtil.getyyyy_MM_dd(model.getSendDate())); |
| 130 | 162 | |
| 131 | 163 | result.setSendDateType(model.getSendDateType()); |