Browse Source

停车历史接口优化2

master
wanghongjun 4 weeks ago
parent
commit
7df5ef43d9
  1. 8
      app/Exports/ParkingAccessRecordExport.php
  2. 8
      app/Http/Controllers/Admin/ParkingAccessRecordController.php

8
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]
);
}
}

8
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]
);
}
}

Loading…
Cancel
Save