jiangjiazhi / regional-platform

Authored by liquanyu over 9 years ago

Exists in master and in 8 other branches

Showing 2 changed files with 22 additions and 4 deletions

...	...	@@ -159,8 +159,8 @@
159	159	@RequestParam(required = false) String areaId,
160	160	@RequestParam(required = false) String hospitalName,
161	161	@RequestParam(required = false) Integer status,
162		- @RequestParam("page") Integer page,
163		- @RequestParam("limit") Integer limit
	162	+ @RequestParam(required = false) Integer page,
	163	+ @RequestParam(required = false) Integer limit
164	164	) {
165	165	return smsConfigFacade.queryConfigHospitals(hospitalName,provinceId, cityId, areaId, status,page,limit);
166	166	}

...	...	@@ -519,7 +519,7 @@
519	519	}
520	520
521	521	String cid = org.getCityId();
522		- if (StringUtils.isNotEmpty(provinceId))
	522	+ if (StringUtils.isNotEmpty(cid))
523	523	{
524	524	query.setId(cid);
525	525	List<BasicConfig> configList = basicConfigService.queryBasicConfig(query);
...	...	@@ -557,7 +557,25 @@
557	557	SmsConfigModel model = smsmodels.get(0);
558	558	if (model != null)
559	559	{
560		- sendTime = model.getGuideTime();
	560	+ String tempSendTime = model.getGuideTime();
	561	+ if (StringUtils.isNotEmpty(tempSendTime))
	562	+ {
	563	+ List<String> weeks = JsonUtil.toList(tempSendTime,String.class);
	564	+ if (CollectionUtils.isNotEmpty(weeks))
	565	+ {
	566	+ for(int i = 0 ;i < weeks.size() ; i++)
	567	+ {
	568	+ if (i == weeks.size()-1)
	569	+ {
	570	+ sendTime +=weeks.get(i);
	571	+ }
	572	+ else
	573	+ {
	574	+ sendTime +=weeks.get(i)+"、";
	575	+ }
	576	+ }
	577	+ }
	578	+ }
561	579	// 0运行 1试运行 2停止
562	580	if (model.getStatus() == 0)
563	581	{