Commit 74af40cf authored by 李腾威's avatar 李腾威

融合调度短信模板与详情及短信信息不一致处理

parent e297e5da
...@@ -267,7 +267,7 @@ public class AlertSubmittedController extends BaseController { ...@@ -267,7 +267,7 @@ public class AlertSubmittedController extends BaseController {
Map<String, String> definitions = new HashMap<>(); Map<String, String> definitions = new HashMap<>();
definitions.put("$type",alertCalled.getAlertType()); definitions.put("$type",alertCalled.getAlertType());
definitions.put("$callTime", DateUtils.dateTimeToDateString(alertCalled.getCallTime())); definitions.put("$callTime", DateUtils.convertDateToString(alertCalled.getCallTime(),DateUtils.DATE_TIME_PATTERN));
definitions.put("$replaceContent",replaceContent); definitions.put("$replaceContent",replaceContent);
definitions.put("$address",alertCalled.getAddress()); definitions.put("$address",alertCalled.getAddress());
definitions.put("$recDate",DateUtils.convertDateToString(alertCalled.getRecDate(),DateUtils.DATE_TIME_PATTERN)); definitions.put("$recDate",DateUtils.convertDateToString(alertCalled.getRecDate(),DateUtils.DATE_TIME_PATTERN));
......
...@@ -1174,7 +1174,7 @@ public class AlertSubmittedServiceImpl extends BaseService<AlertSubmittedDto, Al ...@@ -1174,7 +1174,7 @@ public class AlertSubmittedServiceImpl extends BaseService<AlertSubmittedDto, Al
dataDictionary.getCode()).eq("format", true)); dataDictionary.getCode()).eq("format", true));
Map<String, String> definitions = new HashMap<>(); Map<String, String> definitions = new HashMap<>();
definitions.put("$type",alertCalled.getAlertType()); definitions.put("$type",alertCalled.getAlertType());
definitions.put("$callTime", DateUtils.dateTimeToDateString(alertCalled.getCallTime())); definitions.put("$callTime", DateUtils.convertDateToString(alertCalled.getCallTime(),DateUtils.DATE_TIME_PATTERN));
definitions.put("$replaceContent",replaceContent); definitions.put("$replaceContent",replaceContent);
definitions.put("$address",alertCalled.getAddress()); definitions.put("$address",alertCalled.getAddress());
definitions.put("$contactUser",alertCalled.getContactUser()); definitions.put("$contactUser",alertCalled.getContactUser());
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment