|
|
|
@ -341,17 +341,12 @@ class ParkingReservationController extends BaseController |
|
|
|
|
|
|
|
$patternId = EventCalendar::getDatePatternId($date); |
|
|
|
$space_set_name = ''; |
|
|
|
$pattern_space_type_ids = []; |
|
|
|
$member_type_list = []; |
|
|
|
$space_type_ids = $query->pluck('space_type_id')->toArray(); |
|
|
|
if ($patternId) { |
|
|
|
$space_set_name = ParkingPattern::getName($patternId); |
|
|
|
$pattern_space_type_ids = ParkingPatternSpace::getParkingSpaceTypeIds($patternId); |
|
|
|
} |
|
|
|
$space_type_ids = $query->pluck('space_type_id')->toArray(); |
|
|
|
$member_type_list = []; |
|
|
|
if ($pattern_space_type_ids && $space_type_ids) { |
|
|
|
$temp_space_type = array_intersect($pattern_space_type_ids, $space_type_ids); |
|
|
|
$member_type_list = ParkingSpaceType::getData(); |
|
|
|
$counts = array_count_values($temp_space_type); |
|
|
|
$counts = $space_type_ids ? array_count_values($space_type_ids) : []; |
|
|
|
foreach ($member_type_list as &$item) { |
|
|
|
$item['count'] = $counts[$item['id']] ?? 0; |
|
|
|
unset($item['id']); |
|
|
|
|