Commit 95db385d15c69037d7ac3d6c2e1f671299502d3e
1 parent
7605afff0f
Exists in
master
and in
6 other branches
短信修改
Showing 1 changed file with 29 additions and 25 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SmsTemplateFacade.java
View file @
95db385
| ... | ... | @@ -266,40 +266,44 @@ |
| 266 | 266 | && temp.getSmsType() != SmsServiceEnums.CJGQTX.getId() |
| 267 | 267 | ) |
| 268 | 268 | { |
| 269 | - //发送频次 | |
| 270 | - Integer sendFreq = temp.getSendFrequency(); | |
| 269 | + if (temp.getSmsType() == SmsServiceEnums.FWDGTX.getId()) | |
| 270 | + { | |
| 271 | + str ="一次" +((temp.getHealthType() == null || temp.getHealthType() == 0 ) ? "健康" : "高危") + " " | |
| 272 | + + ((temp.getTemplateType() == null || temp.getTemplateType() == 0 ) ? "推送" : "短信"); | |
| 273 | + } | |
| 274 | + else | |
| 275 | + { | |
| 276 | + //发送频次 | |
| 277 | + Integer sendFreq = temp.getSendFrequency(); | |
| 271 | 278 | |
| 272 | - String sendDate = temp.getSendDateType() == null ? "" : SendDateEnums.getNameById(temp.getSendDateType()); | |
| 279 | + String sendDate = temp.getSendDateType() == null ? "" : SendDateEnums.getNameById(temp.getSendDateType()); | |
| 273 | 280 | |
| 274 | 281 | |
| 275 | - String dateRange = temp.getStart() == null ? "" : (temp.getStart() + " "+ temp.getEnd()); | |
| 282 | + String dateRange = temp.getStart() == null ? "" : (temp.getStart() + " "+ temp.getEnd()); | |
| 276 | 283 | |
| 277 | - String date = ""; | |
| 284 | + String date = ""; | |
| 278 | 285 | |
| 279 | - if (sendFreq != null && temp.getSendDate() != null) | |
| 280 | - { | |
| 281 | - if (sendFreq == SendFrequencyEnums.ONCE.getId()) | |
| 286 | + if (sendFreq != null && temp.getSendDate() != null) | |
| 282 | 287 | { |
| 283 | - date = DateUtil.getyyyy_MM_dd(temp.getSendDate()); | |
| 288 | + if (sendFreq == SendFrequencyEnums.ONCE.getId()) | |
| 289 | + { | |
| 290 | + date = DateUtil.getyyyy_MM_dd(temp.getSendDate()); | |
| 291 | + } | |
| 292 | + else if (sendFreq == SendFrequencyEnums.MONTH.getId()) | |
| 293 | + { | |
| 294 | + date = DateUtil.getDD(temp.getSendDate()); | |
| 295 | + } | |
| 296 | + else if (sendFreq == SendFrequencyEnums.YEAR.getId()) | |
| 297 | + { | |
| 298 | + date = DateUtil.getMMdd(temp.getSendDate()); | |
| 299 | + } | |
| 284 | 300 | } |
| 285 | - else if (sendFreq == SendFrequencyEnums.MONTH.getId()) | |
| 286 | - { | |
| 287 | - date = DateUtil.getDD(temp.getSendDate()); | |
| 288 | - } | |
| 289 | - else if (sendFreq == SendFrequencyEnums.YEAR.getId()) | |
| 290 | - { | |
| 291 | - date = DateUtil.getMMdd(temp.getSendDate()); | |
| 292 | - } | |
| 293 | - } | |
| 294 | 301 | |
| 295 | - String splDate = temp.getSpecialDateType() == null ? "" : SpecialDateEnums.getNameById(temp.getSpecialDateType()); | |
| 296 | - str = SendFrequencyEnums.getNameById(temp.getSendFrequency())+ " " + sendDate +" "+ date+" "+splDate+ " " +dateRange; | |
| 302 | + String splDate = temp.getSpecialDateType() == null ? "" : SpecialDateEnums.getNameById(temp.getSpecialDateType()); | |
| 303 | + str = SendFrequencyEnums.getNameById(temp.getSendFrequency())+ " " + sendDate +" "+ date+" "+splDate+ " " +dateRange; | |
| 304 | + } | |
| 297 | 305 | } |
| 298 | - else if (temp.getSmsType() == SmsServiceEnums.FWDGTX.getId()) | |
| 299 | - { | |
| 300 | - str ="一次" +((temp.getHealthType() == null || temp.getHealthType() == 0 ) ? "健康" : "高危") + " " | |
| 301 | - + ((temp.getTemplateType() == null || temp.getTemplateType() == 0 ) ? "推送" : "短信"); | |
| 302 | - } | |
| 306 | + | |
| 303 | 307 | |
| 304 | 308 | result.put("sendDate",str); |
| 305 | 309 | result.put("sendTimes", SendTimeEnums.getNameById(temp.getSendTimeType())); |