From 274f8625157cf51a272c12be70e70ad63088b9c8 Mon Sep 17 00:00:00 2001
From: alex <reizero@live.com>
Date: Fri, 16 Apr 2021 09:37:43 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9DateTime=20between=20?=
 =?UTF-8?q?=E6=96=B9=E6=B3=95=E5=AE=9E=E7=8E=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/synebula/gaea/data/date/DateTime.kt     | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/gaea/src/main/kotlin/com/synebula/gaea/data/date/DateTime.kt b/src/gaea/src/main/kotlin/com/synebula/gaea/data/date/DateTime.kt
index 6163127..b227570 100644
--- a/src/gaea/src/main/kotlin/com/synebula/gaea/data/date/DateTime.kt
+++ b/src/gaea/src/main/kotlin/com/synebula/gaea/data/date/DateTime.kt
@@ -26,13 +26,13 @@ class DateTime : Comparable<DateTime> {
      * 列出时间的级别数组
      */
     private val calendarLevel = intArrayOf(
-            Calendar.MILLISECOND,
-            Calendar.SECOND,
-            Calendar.MINUTE,
-            Calendar.HOUR_OF_DAY,
-            Calendar.DAY_OF_MONTH,
-            Calendar.MONTH,
-            Calendar.YEAR
+        Calendar.MILLISECOND,
+        Calendar.SECOND,
+        Calendar.MINUTE,
+        Calendar.HOUR_OF_DAY,
+        Calendar.DAY_OF_MONTH,
+        Calendar.MONTH,
+        Calendar.YEAR
     )
 
     val date: Date
@@ -279,7 +279,8 @@ class DateTime : Comparable<DateTime> {
      * @return 是否。
      */
     fun between(start: DateTime, end: DateTime): Boolean {
-        return this in start..end
+        //return this in start..end
+        return start.dateNoTime.compareTo(this.dateNoTime) * this.dateNoTime.compareTo(end.dateNoTime) >= 0
     }
 
     /**