jiangjiazhi / regional-platform

Authored by liquanyu over 7 years ago

Exists in master and in 6 other branches

Showing 2 changed files with 13 additions and 2 deletions

...	...	@@ -1058,7 +1058,7 @@
1058	1058	data.put("phone",map.get("phone"));
1059	1059	data.put("first", map.get("first"));
1060	1060	data.put("planTime",map.get("planTime"));
1061		- data.put("actualTime",map.get("actualTime"));
	1061	+ data.put("smsActualTime",map.get("smsActualTime"));
1062	1062	data.put("dxStatus",map.get("dxStatus"));
1063	1063	data.put("timeType",map.get("timeType"));
1064	1064	datas.add(data);
...	...	@@ -1073,7 +1073,7 @@
1073	1073	cnames.put("phone", "电话号码");
1074	1074	cnames.put("first", "短信内容");
1075	1075	cnames.put("planTime", "计划发送时间");
1076		- cnames.put("actualTime", "实际发送时间");
	1076	+ cnames.put("smsActualTime", "实际发送时间");
1077	1077	cnames.put("dxStatus", "推送状态");
1078	1078	cnames.put("timeType", "是否及时");
1079	1079	httpServletResponse.setContentType("application/octet-stream");
...	...	@@ -1148,6 +1148,7 @@
1148	1148	map.put("objType",ServiceObjEnums.getServiceObjById(obj.getObjtype()));
1149	1149	map.put("planTime", obj.getPlanTime());
1150	1150	map.put("actualTime", obj.getActualTime() == null ? "" : obj.getActualTime());
	1151	+ map.put("smsActualTime", obj.getSmsActualTime() == null ? "" : obj.getSmsActualTime());
1151	1152	map.put("timeType",SmsTimeTypeEnums.getNameById(obj.getTimeType()));
1152	1153	map.put("smsStatus", MsgStatusEnums.getNameById(obj.getStatus()));
1153	1154	map.put("first", obj.getFirst());

...	...	@@ -12,6 +12,7 @@
12	12	private String created;
13	13	private String planTime;
14	14	private String actualTime;
	15	+ private String smsActualTime;
15	16	private String hospitalId;
16	17	private String patientId;
17	18	private String wxTempId;
...	...	@@ -31,6 +32,15 @@
31	32
32	33	//短信发送状态
33	34	private Integer smsStatus;
	35	+
	36	+
	37	+ public String getSmsActualTime() {
	38	+ return smsActualTime;
	39	+ }
	40	+
	41	+ public void setSmsActualTime(String smsActualTime) {
	42	+ this.smsActualTime = smsActualTime;
	43	+ }
34	44
35	45	public Integer getServiceType() {
36	46	return serviceType;