|
|
|
@ -33,10 +33,15 @@ class VipAccessRecordController extends Controller |
|
|
|
try { |
|
|
|
$query = AdminVipAccessRecord::query(); |
|
|
|
|
|
|
|
if ($request->has('space')) { |
|
|
|
$space = $request->input('space'); |
|
|
|
if (!empty($space)) { |
|
|
|
$query->where('parking_space_id', 'like', "%{$space}%"); |
|
|
|
if ($request->has('space_type')) { |
|
|
|
$space_type = $request->input('space_type'); |
|
|
|
if (!empty($space_type)) { |
|
|
|
$space_type_ids = ParkingSpaceType::query()->where( |
|
|
|
'name', |
|
|
|
'like', |
|
|
|
"%{$space_type}%" |
|
|
|
)->pluck('id'); |
|
|
|
$query->whereIn('parking_space_id', $space_type_ids); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
@ -86,7 +91,7 @@ class VipAccessRecordController extends Controller |
|
|
|
$leave_end_time = $request->input('leave_end_time'); |
|
|
|
if (!empty($leave_start_time) && !empty($leave_end_time)) { |
|
|
|
$query->whereBetween( |
|
|
|
'enter_time', |
|
|
|
'leave_time', |
|
|
|
[$leave_start_time, $leave_end_time] |
|
|
|
); |
|
|
|
} |
|
|
|
@ -118,7 +123,7 @@ class VipAccessRecordController extends Controller |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
protected function optionItem(array $item): array |
|
|
|
protected function optionItem($item) |
|
|
|
{ |
|
|
|
$item['license_number'] = AdminVipList::query()->where( |
|
|
|
'id', |
|
|
|
|