From 974f3465259bbb8fbfb08c9e27ac7ee6c133980e Mon Sep 17 00:00:00 2001 From: cody <648753004@qq.com> Date: Wed, 26 Nov 2025 13:54:12 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8F=98=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Http/Controllers/Admin/GateController.php | 4 ++-- app/Http/Controllers/Admin/VisitController.php | 4 ++-- app/Models/Visit.php | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/app/Http/Controllers/Admin/GateController.php b/app/Http/Controllers/Admin/GateController.php index 80349d9..e2bd901 100644 --- a/app/Http/Controllers/Admin/GateController.php +++ b/app/Http/Controllers/Admin/GateController.php @@ -85,8 +85,8 @@ class GateController extends CommonController } if (isset($all['start_date']) && isset($all['end_date'])) { $query->where(function ($q) use ($all) { - $q->whereBetween('visit_time', [$all['start_date'], $all['end_date']]) - ->orWhereBetween('visit_time', [$all['start_date'], $all['end_date']]); + $q->whereBetween('start_date', [$all['start_date'], $all['end_date']]) + ->orWhereBetween('end_date', [$all['start_date'], $all['end_date']]); }); } })->orderBy($all['sort_name'] ?? 'id', $all['sort_type'] ?? 'desc')->paginate($all['page_size'] ?? 20);; diff --git a/app/Http/Controllers/Admin/VisitController.php b/app/Http/Controllers/Admin/VisitController.php index 5fc0238..6fa6002 100644 --- a/app/Http/Controllers/Admin/VisitController.php +++ b/app/Http/Controllers/Admin/VisitController.php @@ -59,8 +59,8 @@ class VisitController extends CommonController } if (isset($all['start_date']) && isset($all['end_date'])) { $query->where(function ($q) use ($all) { - $q->whereBetween('visit_time', [$all['start_date'], $all['end_date']]) - ->orWhereBetween('visit_time', [$all['start_date'], $all['end_date']]); + $q->whereBetween('start_date', [$all['start_date'], $all['end_date']]) + ->orWhereBetween('end_date', [$all['start_date'], $all['end_date']]); }); } if (isset($all['my_self']) && !empty($all['my_self'])) { diff --git a/app/Models/Visit.php b/app/Models/Visit.php index 686b594..3552ec2 100644 --- a/app/Models/Visit.php +++ b/app/Models/Visit.php @@ -171,8 +171,8 @@ class Visit extends SoftDeletesModel } if ($startDate && $endDate) { $query->where(function ($q) use ($startDate, $endDate) { - $q->whereBetween('visit_time', [$startDate, $endDate]) - ->orWhereBetween('visit_time', [$startDate, $endDate]); + $q->whereBetween('start_date', [$startDate, $endDate]) + ->orWhereBetween('end_date', [$startDate, $endDate]); }); } })->get();