From 8725f79377d84d314f4906c40d081d8997dd9a6e Mon Sep 17 00:00:00 2001 From: lizijie <lzjiiie@163.com> Date: Tue, 15 Mar 2022 15:37:01 +0800 Subject: [PATCH] 环比数据接口页数功能修改 --- screen-api/src/main/java/com/moral/api/pojo/form/dataDisplay/MonitorPointDataDisplayForm.java | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/screen-api/src/main/java/com/moral/api/pojo/form/dataDisplay/MonitorPointDataDisplayForm.java b/screen-api/src/main/java/com/moral/api/pojo/form/dataDisplay/MonitorPointDataDisplayForm.java index 16b8cc4..86df41a 100644 --- a/screen-api/src/main/java/com/moral/api/pojo/form/dataDisplay/MonitorPointDataDisplayForm.java +++ b/screen-api/src/main/java/com/moral/api/pojo/form/dataDisplay/MonitorPointDataDisplayForm.java @@ -58,20 +58,20 @@ } else { if(startTime!=null&&endTime!=null) return false; - if (reportType.equals(Constants.HOURYLYREPORT)) { + if (reportType.equals(Constants.HOURLY_REPORT)) { //������������������������������������������ Date previousHour = DateUtils.getDateOfMin(new Date(), -60); startTime = DateUtils.getHourlyStartTime(previousHour); - } else if (reportType.equals(Constants.DAILYREPORT)) { + } else if (reportType.equals(Constants.DAILY_REPORT)) { //������������������������������������ Date yesterday = DateUtils.getDateOfDay(new Date(),-1); startTime = DateUtils.getDailyStartTime(yesterday); - } else if (reportType.equals(Constants.WEEKLYREPORT)) { + } else if (reportType.equals(Constants.WEEKLY_REPORT)) { //������������������������������������ Date previous = DateUtils.getDateOfDay(new Date(),-7); startTime = DateUtils.getWeeklyStartTime(previous); endTime = DateUtils.getWeeklyEndTime(previous); - } else if (reportType.equals(Constants.MONTHLYREPORT)) { + } else if (reportType.equals(Constants.MONTHLY_REPORT)) { //������������������������������������ Date lastMonthFirstDay = DateUtils.getFirstDayOfLastMonth(); startTime = DateUtils.getMonthlyStartTime(lastMonthFirstDay); -- Gitblit v1.8.0