jiangjiazhi / regional-platform

Commit 1c1c961557f7389e452a66396f00fee748522bb0

Authored by liquanyu almost 7 years ago

Exists in master and in 6 other branches

短信修改

Showing 3 changed files with 31 additions and 1 deletions

platform-dal/src/main/java/com/lyms/platform/pojo/SmsTemplateModel.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SmsTemplateFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/SmsTemplateRequest.java

...	...	@@ -65,6 +65,18 @@
65	65	private Integer templateType;
66	66	private Integer yn;
67	67
	68	+
	69	+ //健康类型 0健康 1高危
	70	+ private Integer healthType;
	71	+
	72	+ public Integer getHealthType() {
	73	+ return healthType;
	74	+ }
	75	+
	76	+ public void setHealthType(Integer healthType) {
	77	+ this.healthType = healthType;
	78	+ }
	79	+
68	80	public Integer getTemplateType() {
69	81	return templateType;
70	82	}

...	...	@@ -79,7 +79,7 @@
79	79	model.setCreated(new Date());
80	80	model.setModified(new Date());
81	81	SmsTemplateModel result = smsTemplateService.addSmsTemplate(model);
82		- operateLogFacade.addAddOptLog(userId,Integer.parseInt(hospitalId),result,OptActionEnums.ADD.getId(),"添加短信模板");
	82	+ operateLogFacade.addAddOptLog(userId, Integer.parseInt(hospitalId), result, OptActionEnums.ADD.getId(), "添加短信模板");
83	83	BaseObjectResponse objectResponse = new BaseObjectResponse();
84	84	objectResponse.setData(result.getId());
85	85	objectResponse.setErrorcode(ErrorCodeConstants.SUCCESS);
...	...	@@ -123,6 +123,7 @@
123	123	model.setSpecialDateType(request.getSpecialDateType());
124	124	model.setStatus(request.getStatus());
125	125	model.setTemplateType(request.getTemplateType());
	126	+ model.setHealthType(request.getHealthType());
126	127
127	128	return model;
128	129	}
...	...	@@ -260,6 +261,7 @@
260	261	&& temp.getSmsType() != SmsServiceEnums.TSYYTX.getId()
261	262	&& temp.getSmsType() != SmsServiceEnums.TYZDYYTX.getId()
262	263	&& temp.getSmsType() != SmsServiceEnums.TLZDYYTX.getId()
	264	+ && temp.getSmsType() != SmsServiceEnums.CJGQTX.getId()
263	265	)
264	266	{
265	267	//发送频次
...	...	@@ -290,6 +292,11 @@
290	292
291	293	String splDate = temp.getSpecialDateType() == null ? "" : SpecialDateEnums.getNameById(temp.getSpecialDateType());
292	294	str = SendFrequencyEnums.getNameById(temp.getSendFrequency())+ " " + sendDate +" "+ date+" "+splDate+ " " +dateRange;
	295	+ }
	296	+ else if (temp.getSmsType() != SmsServiceEnums.EBGQTX.getId())
	297	+ {
	298	+ str ="一次" +((temp.getHealthType() == null \|\| temp.getHealthType() == 0 ) ? "健康" : "高危")
	299	+ + ((temp.getTemplateType() == null \|\| temp.getTemplateType() == 0 ) ? "推送" : "短信");
293	300	}
294	301
295	302	result.put("sendDate",str);

...	...	@@ -67,6 +67,17 @@
67	67	//模板类型 0推送 1短信
68	68	private Integer templateType;
69	69
	70	+ //健康类型 0健康 1高危
	71	+ private Integer healthType;
	72	+
	73	+ public Integer getHealthType() {
	74	+ return healthType;
	75	+ }
	76	+
	77	+ public void setHealthType(Integer healthType) {
	78	+ this.healthType = healthType;
	79	+ }
	80	+
70	81	public Integer getTemplateType() {
71	82	return templateType;
72	83	}