shiyang / regional-platform

Commit 10046358341fef557ff2322e7ee57ff85a5ca8e2

Authored by liquanyu over 9 years ago

模板日期

Showing 1 changed file with 30 additions and 12 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SmsTemplateFacade.java

...	...	@@ -72,21 +72,22 @@
72	72
73	73	model.setContent(request.getContent());
74	74
75		- if (request.getSendFrequency() == SendFrequencyEnums.ONCE.getId())
	75	+ if (request.getSendFrequency() != null)
76	76	{
77		- model.setSendDate(DateUtil.parseYMD(request.getSendDate()));
	77	+ if (request.getSendFrequency() == SendFrequencyEnums.ONCE.getId())
	78	+ {
	79	+ model.setSendDate(DateUtil.parseYMD(request.getSendDate()));
	80	+ }
	81	+ else if (request.getSendFrequency() == SendFrequencyEnums.MONTH.getId())
	82	+ {
	83	+ model.setSendDate(DateUtil.parseD(request.getSendDate()));
	84	+ }
	85	+ else if (request.getSendFrequency() == SendFrequencyEnums.YEAR.getId())
	86	+ {
	87	+ model.setSendDate(DateUtil.parseMD(request.getSendDate()));
	88	+ }
78	89	}
79		- else if (request.getSendFrequency() == SendFrequencyEnums.MONTH.getId())
80		- {
81		- model.setSendDate(DateUtil.parseD(request.getSendDate()));
82		- }
83		- else if (request.getSendFrequency() == SendFrequencyEnums.YEAR.getId())
84		- {
85		- model.setSendDate(DateUtil.parseMD(request.getSendDate()));
86		- }
87	90
88		-
89		-
90	91	model.setSendDateType(request.getSendDateType());
91	92	model.setSendFrequency(request.getSendFrequency());
92	93	model.setServiceObj(request.getServiceObj());
...	...	@@ -140,6 +141,23 @@
140	141	result.setId(model.getId());
141	142
142	143	result.setContent(model.getContent());
	144	+
	145	+ if (model.getSendFrequency() != null)
	146	+ {
	147	+ if (model.getSendFrequency() == SendFrequencyEnums.ONCE.getId())
	148	+ {
	149	+ result.setSendDate(DateUtil.getyyyy_MM_dd(model.getSendDate()));
	150	+ }
	151	+ else if (model.getSendFrequency() == SendFrequencyEnums.MONTH.getId())
	152	+ {
	153	+ result.setSendDate(DateUtil.getMMdd(model.getSendDate()));
	154	+ }
	155	+ else if (model.getSendFrequency() == SendFrequencyEnums.YEAR.getId())
	156	+ {
	157	+ result.setSendDate(DateUtil.getDD(model.getSendDate()));
	158	+ }
	159	+ }
	160	+
143	161	result.setSendDate(DateUtil.getyyyy_MM_dd(model.getSendDate()));
144	162
145	163	result.setSendDateType(model.getSendDateType());