|
|
@@ -327,11 +327,17 @@ class FishingAreaController extends BaseApiController
|
|
|
$totalPages = (int) ceil($total / $perPage);
|
|
|
}
|
|
|
|
|
|
- $sql = "(SELECT id, 'onboard' AS place_type, name, address, status_YN, created_at
|
|
|
- FROM onboard WHERE area_id = ? AND deleted_YN = 'N')
|
|
|
+ $sql = "(SELECT o.id, 'onboard' AS place_type, o.name, o.address, o.status_YN,
|
|
|
+ o.partnership_YN, ff.name AS field_name, o.created_at
|
|
|
+ FROM onboard o
|
|
|
+ LEFT JOIN fishing_field ff ON ff.id = o.field_id AND ff.deleted_YN = 'N'
|
|
|
+ WHERE o.area_id = ? AND o.deleted_YN = 'N')
|
|
|
UNION ALL
|
|
|
- (SELECT id, 'fishing' AS place_type, name, address, status_YN, created_at
|
|
|
- FROM fishing WHERE area_id = ? AND deleted_YN = 'N')
|
|
|
+ (SELECT fi.id, 'fishing' AS place_type, fi.name, fi.address, fi.status_YN,
|
|
|
+ fi.partnership_YN, ff2.name AS field_name, fi.created_at
|
|
|
+ FROM fishing fi
|
|
|
+ LEFT JOIN fishing_field ff2 ON ff2.id = fi.field_id AND ff2.deleted_YN = 'N'
|
|
|
+ WHERE fi.area_id = ? AND fi.deleted_YN = 'N')
|
|
|
ORDER BY created_at DESC
|
|
|
{$tail}";
|
|
|
$items = $db->query($sql, [$areaId, $areaId])->getResult();
|