From 52c60fcaea97cece4b39987a3b8b248964dbe280 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Tue, 02 Nov 2021 11:28:23 +0800
Subject: [PATCH] screen-api            修改计算首要污染物BUG

---
 screen-common/src/main/java/com/moral/util/DateUtils.java |    7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)

diff --git a/screen-common/src/main/java/com/moral/util/DateUtils.java b/screen-common/src/main/java/com/moral/util/DateUtils.java
index d6a03cb..3c1c89e 100644
--- a/screen-common/src/main/java/com/moral/util/DateUtils.java
+++ b/screen-common/src/main/java/com/moral/util/DateUtils.java
@@ -103,6 +103,7 @@
         cal.setTime(date);
         cal.set(Calendar.MINUTE,0);
         cal.set(Calendar.SECOND,0);
+        cal.set(Calendar.MILLISECOND,0);
         return cal.getTime();
     }
 
@@ -118,6 +119,7 @@
         cal.setTime(date);
         cal.set(Calendar.MINUTE,59);
         cal.set(Calendar.SECOND,59);
+        cal.set(Calendar.MILLISECOND,0);
         return cal.getTime();
     }
 
@@ -167,6 +169,7 @@
         cal.set(Calendar.HOUR_OF_DAY,0);
         cal.set(Calendar.MINUTE,0);
         cal.set(Calendar.SECOND,0);
+        cal.set(Calendar.MILLISECOND,0);
         return cal.getTime();
     }
 
@@ -187,6 +190,7 @@
         cal.set(Calendar.HOUR_OF_DAY,23);
         cal.set(Calendar.MINUTE,59);
         cal.set(Calendar.SECOND,59);
+        cal.set(Calendar.MILLISECOND,0);
         return cal.getTime();
     }
 
@@ -204,6 +208,7 @@
         cal.set(Calendar.HOUR_OF_DAY,0);
         cal.set(Calendar.MINUTE,0);
         cal.set(Calendar.SECOND,0);
+        cal.set(Calendar.MILLISECOND,0);
         return cal.getTime();
     }
 
@@ -221,6 +226,7 @@
         cal.set(Calendar.HOUR_OF_DAY,23);
         cal.set(Calendar.MINUTE,59);
         cal.set(Calendar.SECOND,59);
+        cal.set(Calendar.MILLISECOND,0);
         return cal.getTime();
     }
 
@@ -1111,6 +1117,7 @@
         return todayStart.getTime().getTime();
     }
 
+
     public static Integer getTodayInt() {
         return (int) (getTodayTime() / 1000);
     }

--
Gitblit v1.8.0