From 3d03cc25a1b3e8c6e26730bfed67462cf29ad51f Mon Sep 17 00:00:00 2001 From: venba-Inspriron-3558 Date: Mon, 14 Jul 2025 14:44:37 +0530 Subject: [PATCH] air report group-concat --- app/Models/ReportsModel.php | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/app/Models/ReportsModel.php b/app/Models/ReportsModel.php index b2a5190..cec9530 100644 --- a/app/Models/ReportsModel.php +++ b/app/Models/ReportsModel.php @@ -172,13 +172,16 @@ class ReportsModel extends Model WHEN m_plan.trip_type = 2 THEN 'international' ELSE 'unknown' END AS plan_trip_type, - CONCAT_WS(' - ', - -- CONCAT(acsf.Airport, ' (', acsf.City, ')'), - -- CONCAT(acst.Airport, ' (', acst.City, ')') - CONCAT(acsf.Code, ' - ', acst.Code) - ) AS sector, - m_dropdown.dropdown_value as flight_class, - DATE_FORMAT(cc_flight_trips.date, '%d-%m-%Y') AS flight_travel_date + -- CONCAT_WS(' - ', + -- -- CONCAT(acsf.Airport, ' (', acsf.City, ')'), + -- -- CONCAT(acst.Airport, ' (', acst.City, ')') + -- CONCAT(acsf.Code, ' - ', acst.Code) + -- ) AS sector, + -- m_dropdown.dropdown_value as flight_class, + -- DATE_FORMAT(cc_flight_trips.date, '%d-%m-%Y') AS flight_travel_date + GROUP_CONCAT(CONCAT(acsf.Code, '-', acst.Code) SEPARATOR ' / ') AS sector, + GROUP_CONCAT(m_dropdown.dropdown_value SEPARATOR ' / ') AS flight_class, + GROUP_CONCAT(DATE_FORMAT(cc_flight_trips.date, '%d-%m-%Y') SEPARATOR ' / ') AS flight_travel_date FROM m_plan JOIN m_users ON m_plan.user_id = m_users.user_id @@ -197,7 +200,10 @@ class ReportsModel extends Model AND DATE(m_plan.created_on) >= ? AND DATE(m_plan.created_on) <= ? - ; + GROUP BY + m_plan.plan_id, + c_flight.trip_type, + m_plan.trip_type; "; $binds = [$fromDate, $toDate];