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 bb8d8ce..36ad152 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 @@ -18,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.Calendar; import java.util.Date; /** @@ -335,7 +336,9 @@ public class AreaCountController extends BaseController { Date endTime = param.getEndTime(); if (startTime != null && endTime != null){ param.setStartTime(new Date(startTime.getTime() - 28800000)); - param.setEndTime(new Date(endTime.getTime() - 28800000)); + // 結束時間 + Date time = getTodayEndDate(endTime); + param.setEndTime(time); } } if (object instanceof HealthManagerListRequest){ @@ -344,9 +347,26 @@ public class AreaCountController extends BaseController { Date endTime = param.getEndTime(); if (startTime != null && endTime != null){ param.setStartTime(new Date(startTime.getTime() - 28800000)); - param.setEndTime(new Date(endTime.getTime() - 28800000)); + // 結束時間 + Date time = getTodayEndDate(endTime); + param.setEndTime(time); } } } + /** + * 結束時間 + * + * @param endTime + * @return + */ + private Date getTodayEndDate(Date endTime) { + Calendar todayEnd = Calendar.getInstance(); + todayEnd.setTime(new Date(endTime.getTime() - 28800000)); + todayEnd.set(Calendar.HOUR_OF_DAY, 23); + todayEnd.set(Calendar.MINUTE, 59); + todayEnd.set(Calendar.SECOND, 59); + return todayEnd.getTime(); + } + } \ No newline at end of file