diff --git a/app/Exports/ParkingAccessRecordExport.php b/app/Exports/ParkingAccessRecordExport.php index cd424ef..af78ee3 100644 --- a/app/Exports/ParkingAccessRecordExport.php +++ b/app/Exports/ParkingAccessRecordExport.php @@ -87,7 +87,7 @@ class ParkingAccessRecordExport implements FromArray, WithHeadings if ($parents['start_enter_time'] && $parents['end_enter_time']) { $query->whereBetween( 'enter_time', - [$parents['start_enter_time'], $parents['end_enter_time']] + [$parents['start_enter_time'] . ' 00:00:00', $parents['end_enter_time']. ' 23:59:59'] ); } } @@ -95,7 +95,7 @@ class ParkingAccessRecordExport implements FromArray, WithHeadings if ($parents['start_leave_time'] && $parents['end_leave_time']) { $query->whereBetween( 'enter_time', - [$parents['start_leave_time'], $parents['end_leave_time']] + [$parents['start_leave_time'] . ' 00:00:00', $parents['end_leave_time']. ' 23:59:59'] ); } } diff --git a/app/Http/Controllers/Admin/ParkingAccessRecordController.php b/app/Http/Controllers/Admin/ParkingAccessRecordController.php index 613e1d6..3042d8e 100644 --- a/app/Http/Controllers/Admin/ParkingAccessRecordController.php +++ b/app/Http/Controllers/Admin/ParkingAccessRecordController.php @@ -125,7 +125,7 @@ class ParkingAccessRecordController extends BaseController if ($start_enter_time && $end_enter_time) { $query->whereBetween( 'enter_time', - [$start_enter_time, $end_enter_time] + [$start_enter_time . ' 00:00:00', $end_enter_time . ' 23:59:59'] ); } } @@ -140,7 +140,7 @@ class ParkingAccessRecordController extends BaseController if ($start_leave_time && $end_leave_time) { $query->whereBetween( 'enter_time', - [$start_leave_time, $end_leave_time] + [$start_leave_time . ' 00:00:00', $end_leave_time . ' 23:59:59'] ); } }