Commit b335557d6a5b26316063a81a811d57fe03459514
1 parent
169168b167
Exists in
master
and in
1 other branch
短信模板
Showing 1 changed file with 17 additions and 3 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SmsTemplateFacade.java
View file @
b335557
| ... | ... | @@ -241,12 +241,26 @@ |
| 241 | 241 | |
| 242 | 242 | String dateRange = temp.getStart() == null ? "" : (temp.getStart() + " "+ temp.getEnd()); |
| 243 | 243 | |
| 244 | - String date = temp.getSendDate() == null ? "" : DateUtil.getyyyy_MM_dd(temp.getSendDate()); | |
| 244 | + String date = ""; | |
| 245 | 245 | |
| 246 | + if (sendFreq != null) | |
| 247 | + { | |
| 248 | + if (sendFreq == SendFrequencyEnums.ONCE.getId()) | |
| 249 | + { | |
| 250 | + date = DateUtil.getyyyy_MM_dd(temp.getSendDate()); | |
| 251 | + } | |
| 252 | + else if (sendFreq == SendFrequencyEnums.MONTH.getId()) | |
| 253 | + { | |
| 254 | + date = DateUtil.getDD(temp.getSendDate()); | |
| 255 | + } | |
| 256 | + else if (sendFreq == SendFrequencyEnums.YEAR.getId()) | |
| 257 | + { | |
| 258 | + date = DateUtil.getMMdd(temp.getSendDate()); | |
| 259 | + } | |
| 260 | + } | |
| 261 | + | |
| 246 | 262 | String splDate = temp.getSpecialDateType() == null ? "" : SpecialDateEnums.getNameById(temp.getSpecialDateType()); |
| 247 | 263 | String str = SendFrequencyEnums.getNameById(temp.getSendFrequency())+ " " + sendDate +" "+ date+" "+splDate+ " " +dateRange; |
| 248 | - | |
| 249 | - | |
| 250 | 264 | |
| 251 | 265 | result.put("sendDate",str); |
| 252 | 266 | result.put("sendTimes", SendTimeEnums.getNameById(temp.getSendTimeType())); |