From 98e8cacdb51b5e31ce2e6670100fcf6408b9c8d9 Mon Sep 17 00:00:00 2001
From: lizijie <lzjiiie@163.com>
Date: Fri, 08 Oct 2021 09:47:39 +0800
Subject: [PATCH] 调整queryGovMonitorPointHourlyDataByGuidsAndOrgid接口 站点顺序
---
screen-api/src/main/java/com/moral/api/pojo/form/dataDisplay/MonitorPointDataDisplayForm.java | 3 ++-
1 files changed, 2 insertions(+), 1 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 1d1f3d6..16b8cc4 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
@@ -51,7 +51,6 @@
if (reportType == null) {
if (startTime == null || endTime == null)
return false;
- reportType = Constants.DAILYREPORT;
//������������������������������������������
String endTimeStr = DateUtils.dateToDateString(endTime,"yyyy-MM-dd");
endTimeStr+=" 23:59:59";
@@ -71,10 +70,12 @@
//������������������������������������
Date previous = DateUtils.getDateOfDay(new Date(),-7);
startTime = DateUtils.getWeeklyStartTime(previous);
+ endTime = DateUtils.getWeeklyEndTime(previous);
} else if (reportType.equals(Constants.MONTHLYREPORT)) {
//������������������������������������
Date lastMonthFirstDay = DateUtils.getFirstDayOfLastMonth();
startTime = DateUtils.getMonthlyStartTime(lastMonthFirstDay);
+ endTime = DateUtils.getMonthlyEndTime(lastMonthFirstDay);
} else
return false;
}
--
Gitblit v1.8.0