From b1a376cd9cb8b0267269beb4ef0075c52107eabb Mon Sep 17 00:00:00 2001 From: dongqin <123456> Date: Thu, 30 May 2019 11:30:09 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../permission/model/ServiceListQuery.java | 1 + .../web/controller/AreaCountController.java | 35 ++++++++++++++++++++++ .../operate/web/facade/AreaCountFacade.java | 25 ++++++++++------ 3 files changed, 52 insertions(+), 9 deletions(-) diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/ServiceListQuery.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/ServiceListQuery.java index d9e510d..fad3e98 100644 --- a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/ServiceListQuery.java +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/ServiceListQuery.java @@ -1,6 +1,7 @@ package com.lyms.platform.permission.model; import com.lyms.platform.common.dao.BaseQuery; +import org.springframework.format.annotation.DateTimeFormat; import java.util.Date; import java.util.List; diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/AreaCountController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/AreaCountController.java index 8fd4e6b..bb8d8ce 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/AreaCountController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/AreaCountController.java @@ -5,6 +5,7 @@ import com.lyms.platform.common.base.BaseController; import com.lyms.platform.common.base.LoginContext; import com.lyms.platform.common.constants.ErrorCodeConstants; import com.lyms.platform.common.result.BaseResponse; +import com.lyms.platform.common.utils.DateUtil; import com.lyms.platform.operate.web.facade.AreaCountFacade; import com.lyms.platform.operate.web.request.HealthManagerListRequest; import com.lyms.platform.permission.model.ServiceListQuery; @@ -17,6 +18,7 @@ import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; +import java.util.Date; /** * @@ -202,6 +204,7 @@ public class AreaCountController extends BaseController { public BaseResponse getServiceList(@RequestBody @Valid ServiceListQuery query, HttpServletRequest request){ LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); query.setUserId(loginState.getId()); + checkDate(query); try { return areaCountFacade.getServiceList(query); }catch (Exception e){ @@ -224,6 +227,7 @@ public class AreaCountController extends BaseController { public BaseResponse getServiceDetailList(@RequestBody @Valid ServiceListQuery param, HttpServletRequest request){ LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); param.setUserId(loginState.getId()); + checkDate(param); try { return areaCountFacade.getServiceDetailList(param); }catch (Exception e){ @@ -245,6 +249,7 @@ public class AreaCountController extends BaseController { public void getServiceDetailExport(ServiceListQuery param, HttpServletRequest request, HttpServletResponse response){ LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); param.setUserId(loginState.getId()); + checkDate(param); try { areaCountFacade.getServiceDetailExport(param, response); }catch (Exception e){ @@ -263,6 +268,7 @@ public class AreaCountController extends BaseController { public BaseResponse healthManagerList(@RequestBody @Valid HealthManagerListRequest query, HttpServletRequest request){ LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); query.setUserId(loginState.getId()); + checkDate(query); try { return areaCountFacade.healthManagerList(query); }catch (Exception e){ @@ -285,6 +291,7 @@ public class AreaCountController extends BaseController { public BaseResponse healthManagerDetailList(@RequestBody @Valid HealthManagerListRequest query, HttpServletRequest request){ LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); query.setUserId(loginState.getId()); + checkDate(query); try { return areaCountFacade.healthManagerDetailList(query); }catch (Exception e){ @@ -307,6 +314,7 @@ public class AreaCountController extends BaseController { public void healthManagerDetailExport(HealthManagerListRequest param, HttpServletRequest request, HttpServletResponse response){ LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); param.setUserId(loginState.getId()); + checkDate(param); try { areaCountFacade.healthManagerDetailExport(param, response); }catch (Exception e){ @@ -314,4 +322,31 @@ public class AreaCountController extends BaseController { } } + /** + * 时区 + * + * @param object + */ + private void checkDate(Object object) { + + if (object instanceof ServiceListQuery){ + ServiceListQuery param = (com.lyms.platform.permission.model.ServiceListQuery) object; + Date startTime = param.getStartTime(); + Date endTime = param.getEndTime(); + if (startTime != null && endTime != null){ + param.setStartTime(new Date(startTime.getTime() - 28800000)); + param.setEndTime(new Date(endTime.getTime() - 28800000)); + } + } + if (object instanceof HealthManagerListRequest){ + HealthManagerListRequest param = (HealthManagerListRequest) object; + Date startTime = param.getStartTime(); + Date endTime = param.getEndTime(); + if (startTime != null && endTime != null){ + param.setStartTime(new Date(startTime.getTime() - 28800000)); + param.setEndTime(new Date(endTime.getTime() - 28800000)); + } + } + } + } \ No newline at end of file diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AreaCountFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AreaCountFacade.java index 5e11356..c252ede 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AreaCountFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AreaCountFacade.java @@ -1315,25 +1315,27 @@ public class AreaCountFacade { String str = ""; switch (serType){ case "1" : - str = "孕期精准医疗"; + //str = "孕期精准医疗"; + str = "精准医疗服务"; break; case "2" : - str = "体重管理"; + str = "体重管理服务"; break; case "3" : - str = "血糖管理"; + str = "血糖管理服务"; break; case "4" : - str = "血压管理"; + str = "血压管理服务"; break; case "5" : - str = "专家咨询"; + str = "专家咨询服务"; break; case "6" : - str = "标准服务"; + //str = "标准服务"; + str = "围产小助理"; break; case "7" : - str = "体温管理"; + str = "体温管理服务"; break; case "8" : str = ""; @@ -1342,10 +1344,10 @@ public class AreaCountFacade { str = ""; break; case "10" : - str = "精准指导"; + str = "儿保小助理服务"; break; case "11" : - str = "标准服务"; + str = "精准指导服务"; break; default: str = ""; @@ -1808,6 +1810,11 @@ public class AreaCountFacade { } return healthTypeName; } + + public static void main(String[] args) { + Date date = new Date(1554048000000L); + System.out.println(DateUtil.getyyyy_MM_dd(date)); + } } -- 1.8.3.1