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 7a367fa..f5ac139 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 @@ -315,7 +315,12 @@ 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); + Date endTime = param.getEndTime(); + if (null != endTime) { + Date endDate = getTodayEndDate(endTime, false); + param.setEndTime(endDate); + } + //checkDate(param); try { areaCountFacade.healthManagerDetailExport(param, response); }catch (Exception e){ @@ -337,7 +342,7 @@ public class AreaCountController extends BaseController { if (startTime != null && endTime != null){ param.setStartTime(new Date(startTime.getTime() - 28800000)); // 結束時間 - Date time = getTodayEndDate(endTime); + Date time = getTodayEndDate(endTime, true); param.setEndTime(time); } } @@ -348,7 +353,7 @@ public class AreaCountController extends BaseController { if (startTime != null && endTime != null){ param.setStartTime(new Date(startTime.getTime() - 28800000)); // 結束時間 - Date time = getTodayEndDate(endTime); + Date time = getTodayEndDate(endTime, true); param.setEndTime(time); } } @@ -360,9 +365,14 @@ public class AreaCountController extends BaseController { * @param endTime * @return */ - private Date getTodayEndDate(Date endTime) { + private Date getTodayEndDate(Date endTime, boolean isGMT) { Calendar todayEnd = Calendar.getInstance(); - todayEnd.setTime(new Date(endTime.getTime() - 28800000)); + if (isGMT) { + todayEnd.setTime(new Date(endTime.getTime() - 28800000)); + } + if (!isGMT) { + todayEnd.setTime(new Date(endTime.getTime())); + } todayEnd.set(Calendar.HOUR_OF_DAY, 23); todayEnd.set(Calendar.MINUTE, 59); todayEnd.set(Calendar.SECOND, 59);