diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SmsConfigFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SmsConfigFacade.java index 150ba05..9299bf2 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SmsConfigFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SmsConfigFacade.java @@ -1058,7 +1058,7 @@ public class SmsConfigFacade { data.put("phone",map.get("phone")); data.put("first", map.get("first")); data.put("planTime",map.get("planTime")); - data.put("actualTime",map.get("actualTime")); + data.put("smsActualTime",map.get("smsActualTime")); data.put("dxStatus",map.get("dxStatus")); data.put("timeType",map.get("timeType")); datas.add(data); @@ -1073,7 +1073,7 @@ public class SmsConfigFacade { cnames.put("phone", "电话号码"); cnames.put("first", "短信内容"); cnames.put("planTime", "计划发送时间"); - cnames.put("actualTime", "实际发送时间"); + cnames.put("smsActualTime", "实际发送时间"); cnames.put("dxStatus", "推送状态"); cnames.put("timeType", "是否及时"); httpServletResponse.setContentType("application/octet-stream"); @@ -1148,6 +1148,7 @@ public class SmsConfigFacade { map.put("objType",ServiceObjEnums.getServiceObjById(obj.getObjtype())); map.put("planTime", obj.getPlanTime()); map.put("actualTime", obj.getActualTime() == null ? "" : obj.getActualTime()); + map.put("smsActualTime", obj.getSmsActualTime() == null ? "" : obj.getSmsActualTime()); map.put("timeType",SmsTimeTypeEnums.getNameById(obj.getTimeType())); map.put("smsStatus", MsgStatusEnums.getNameById(obj.getStatus())); map.put("first", obj.getFirst()); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/MsgObj.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/MsgObj.java index 9bc694e..2bc815a 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/MsgObj.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/MsgObj.java @@ -12,6 +12,7 @@ public class MsgObj { private String created; private String planTime; private String actualTime; + private String smsActualTime; private String hospitalId; private String patientId; private String wxTempId; @@ -32,6 +33,15 @@ public class MsgObj { //短信发送状态 private Integer smsStatus; + + public String getSmsActualTime() { + return smsActualTime; + } + + public void setSmsActualTime(String smsActualTime) { + this.smsActualTime = smsActualTime; + } + public Integer getServiceType() { return serviceType; }