From ad4ca33caa55888cc7cb71a67ba31da917d3519a Mon Sep 17 00:00:00 2001
From: wanghongjun <1445693971@qq.com>
Date: Fri, 24 Jul 2026 15:52:51 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E8=A1=8C=E4=BA=8B=E5=8E=86?=
 =?UTF-8?q?=E6=97=A5=E6=9C=9F=E5=88=97=E8=A1=A8=E4=BC=98=E5=8C=96=E3=80=81?=
 =?UTF-8?q?=E7=BC=96=E8=BE=91=E5=AF=BC=E5=85=A5=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Http/Controllers/Admin/EventCalendarController.php | 4 ++--
 app/Imports/EventCalendarImport.php                    | 2 +-
 app/Services/EventCalendarService.php                  | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/Http/Controllers/Admin/EventCalendarController.php b/app/Http/Controllers/Admin/EventCalendarController.php
index 7761d72..52ae2fb 100644
--- a/app/Http/Controllers/Admin/EventCalendarController.php
+++ b/app/Http/Controllers/Admin/EventCalendarController.php
@@ -426,7 +426,7 @@ class EventCalendarController extends BaseController
             $days = get_year_month_days($year_month);
             $items = [];
             $year_month_times = strtotime($year_month);
-            $statusArr = [0, 1];
+            $statusArr = [0, 1, 2];
             foreach ($days as $day) {
                 $date = date("Y-m", $year_month_times) . '-' . $day;
                 $count = EventCalendar::query()->whereIn('status', $statusArr)
@@ -473,7 +473,7 @@ class EventCalendarController extends BaseController
             $start_date = date("Y-m-d", $date_times);
             $start_time = $start_date . ' 00:00:00';
             $end_time = $start_date . ' 23:59:59';
-            $statusIndexArr = [0, 1];
+            $statusIndexArr = [0, 1, 2];
             $query->whereIn('status', $statusIndexArr);
 
             $query->where(
diff --git a/app/Imports/EventCalendarImport.php b/app/Imports/EventCalendarImport.php
index d33d546..7bbc7a0 100644
--- a/app/Imports/EventCalendarImport.php
+++ b/app/Imports/EventCalendarImport.php
@@ -140,7 +140,7 @@ class EventCalendarImport implements ToModel
         return $model->whereIn('status', [0, 1])
             ->where(function ($query) use ($datetime) {
                 $query->whereRaw(
-                    "'{$datetime}' BETWEEN start_time AND end_time"
+                    "'{$datetime}' >= start_time AND '{$datetime}' < end_time"
                 );
             })
             ->exists();
diff --git a/app/Services/EventCalendarService.php b/app/Services/EventCalendarService.php
index c9513c0..733b737 100644
--- a/app/Services/EventCalendarService.php
+++ b/app/Services/EventCalendarService.php
@@ -101,7 +101,7 @@ class EventCalendarService extends BaseService
         $exists = $model->whereIn('status', [0, 1])
             ->where(function ($query) use ($start_time) {
                 $query->whereRaw(
-                    "'{$start_time}' BETWEEN start_time AND end_time"
+                    "'{$start_time}' >= start_time AND '{$start_time}' < end_time"
                 );
             })
             ->exists();