From f0a4e734d8181a736e5b21be3396b3d8a278d837 Mon Sep 17 00:00:00 2001 From: liquanyu Date: Sun, 24 Jul 2016 16:18:21 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8C=BB=E9=99=A2=E5=9F=BA=E7=A1=80=E5=88=97?= =?UTF-8?q?=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/controller/SmsConfigController.java | 4 ++-- .../operate/web/facade/SmsConfigFacade.java | 22 ++++++++++++++++++++-- 2 files changed, 22 insertions(+), 4 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/SmsConfigController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/SmsConfigController.java index ca025bd..e3cfb8c 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/SmsConfigController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/SmsConfigController.java @@ -159,8 +159,8 @@ public class SmsConfigController extends BaseController { @RequestParam(required = false) String areaId, @RequestParam(required = false) String hospitalName, @RequestParam(required = false) Integer status, - @RequestParam("page") Integer page, - @RequestParam("limit") Integer limit + @RequestParam(required = false) Integer page, + @RequestParam(required = false) Integer limit ) { return smsConfigFacade.queryConfigHospitals(hospitalName,provinceId, cityId, areaId, status,page,limit); } 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 05501cf..cbb01da 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 @@ -519,7 +519,7 @@ public class SmsConfigFacade { } String cid = org.getCityId(); - if (StringUtils.isNotEmpty(provinceId)) + if (StringUtils.isNotEmpty(cid)) { query.setId(cid); List configList = basicConfigService.queryBasicConfig(query); @@ -557,7 +557,25 @@ public class SmsConfigFacade { SmsConfigModel model = smsmodels.get(0); if (model != null) { - sendTime = model.getGuideTime(); + String tempSendTime = model.getGuideTime(); + if (StringUtils.isNotEmpty(tempSendTime)) + { + List weeks = JsonUtil.toList(tempSendTime,String.class); + if (CollectionUtils.isNotEmpty(weeks)) + { + for(int i = 0 ;i < weeks.size() ; i++) + { + if (i == weeks.size()-1) + { + sendTime +=weeks.get(i); + } + else + { + sendTime +=weeks.get(i)+"、"; + } + } + } + } // 0运行 1试运行 2停止 if (model.getStatus() == 0) { -- 1.8.3.1