From 3597d6fea2d44113dc63d5a8f6f4dda7a1236540 Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Thu, 06 Jul 2023 11:45:42 +0800
Subject: [PATCH] 测试提交
---
screen-api/src/main/java/com/moral/api/pojo/form/dataDisplay/MonitorPointDataDisplayForm.java | 11 ++++++-----
1 files changed, 6 insertions(+), 5 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..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
@@ -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";
@@ -59,22 +58,24 @@
} 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);
- } else if (reportType.equals(Constants.MONTHLYREPORT)) {
+ endTime = DateUtils.getWeeklyEndTime(previous);
+ } else if (reportType.equals(Constants.MONTHLY_REPORT)) {
//������������������������������������
Date lastMonthFirstDay = DateUtils.getFirstDayOfLastMonth();
startTime = DateUtils.getMonthlyStartTime(lastMonthFirstDay);
+ endTime = DateUtils.getMonthlyEndTime(lastMonthFirstDay);
} else
return false;
}
--
Gitblit v1.8.0