From 531dc517028e2fda0e8477429cc7c835be9f7d28 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Mon, 27 Sep 2021 15:26:16 +0800
Subject: [PATCH] 5分钟统计任务,数据time改为开始时间

---
 screen-api/src/main/java/com/moral/api/pojo/form/dataDisplay/MonitorPointDataDisplayForm.java |    2 ++
 1 files changed, 2 insertions(+), 0 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 21083f0..1d1f3d6 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
@@ -57,6 +57,8 @@
             endTimeStr+=" 23:59:59";
             endTime = DateUtils.getDate(endTimeStr,"yyyy-MM-dd HH:mm:ss");
         } else {
+            if(startTime!=null&&endTime!=null)
+                return false;
             if (reportType.equals(Constants.HOURYLYREPORT)) {
                 //������������������������������������������
                 Date previousHour = DateUtils.getDateOfMin(new Date(), -60);

--
Gitblit v1.8.0