From 7df5ef43d9894c79f9cd58f557b7843522878edb Mon Sep 17 00:00:00 2001 From: wanghongjun <1445693971@qq.com> Date: Mon, 17 Aug 2026 16:44:18 +0800 Subject: [PATCH] =?UTF-8?q?=E5=81=9C=E8=BD=A6=E5=8E=86=E5=8F=B2=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E4=BC=98=E5=8C=962?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Exports/ParkingAccessRecordExport.php | 8 ++++++-- .../Controllers/Admin/ParkingAccessRecordController.php | 8 ++++++-- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/app/Exports/ParkingAccessRecordExport.php b/app/Exports/ParkingAccessRecordExport.php index af78ee3..1f60412 100644 --- a/app/Exports/ParkingAccessRecordExport.php +++ b/app/Exports/ParkingAccessRecordExport.php @@ -85,17 +85,21 @@ class ParkingAccessRecordExport implements FromArray, WithHeadings } if (isset($parents['start_enter_time']) && isset($parents['end_enter_time'])) { if ($parents['start_enter_time'] && $parents['end_enter_time']) { + $start_enter_time = strtotime($parents['start_enter_time'] . ' 00:00:00'); + $end_enter_time = strtotime($parents['end_enter_time']. ' 23:59:59'); $query->whereBetween( 'enter_time', - [$parents['start_enter_time'] . ' 00:00:00', $parents['end_enter_time']. ' 23:59:59'] + [$start_enter_time, $end_enter_time] ); } } if (isset($parents['start_leave_time']) && isset($parents['end_leave_time'])) { if ($parents['start_leave_time'] && $parents['end_leave_time']) { + $start_leave_time = strtotime($parents['start_leave_time'] . ' 00:00:00'); + $end_leave_time = strtotime($parents['end_leave_time']. ' 23:59:59'); $query->whereBetween( 'enter_time', - [$parents['start_leave_time'] . ' 00:00:00', $parents['end_leave_time']. ' 23:59:59'] + [$start_leave_time, $end_leave_time] ); } } diff --git a/app/Http/Controllers/Admin/ParkingAccessRecordController.php b/app/Http/Controllers/Admin/ParkingAccessRecordController.php index 3042d8e..e6a2198 100644 --- a/app/Http/Controllers/Admin/ParkingAccessRecordController.php +++ b/app/Http/Controllers/Admin/ParkingAccessRecordController.php @@ -123,9 +123,11 @@ class ParkingAccessRecordController extends BaseController $start_enter_time = $request->input('start_enter_time'); $end_enter_time = $request->input('end_enter_time'); if ($start_enter_time && $end_enter_time) { + $start_enter_times = strtotime($start_enter_time . ' 00:00:00'); + $end_enter_times = strtotime($end_enter_time . ' 23:59:59'); $query->whereBetween( 'enter_time', - [$start_enter_time . ' 00:00:00', $end_enter_time . ' 23:59:59'] + [$start_enter_times, $end_enter_times] ); } } @@ -138,9 +140,11 @@ class ParkingAccessRecordController extends BaseController $start_leave_time = $request->input('start_leave_time'); $end_leave_time = $request->input('end_leave_time'); if ($start_leave_time && $end_leave_time) { + $start_leave_times = strtotime($start_leave_time . ' 00:00:00'); + $end_leave_times = strtotime($end_leave_time . ' 23:59:59'); $query->whereBetween( 'enter_time', - [$start_leave_time . ' 00:00:00', $end_leave_time . ' 23:59:59'] + [$start_leave_times, $end_leave_times] ); } }