diff --git a/app/Services/Cartables/Mission/Report/ReportTradodService.php b/app/Services/Cartables/Mission/Report/ReportTradodService.php index 2aacae97..3ed3580a 100644 --- a/app/Services/Cartables/Mission/Report/ReportTradodService.php +++ b/app/Services/Cartables/Mission/Report/ReportTradodService.php @@ -37,8 +37,8 @@ class ReportTradodService -1 AS province_id, COUNT(m.id) AS total, COALESCE(SUM(m.mission_duration != m.in_area_duration), 0) AS khareg_mahdode, - COALESCE(SUM(m.in_area_duration), 0) AS gps, - COALESCE(SUM(m.mission_duration), 0) AS durations, + SEC_TO_TIME(COALESCE(SUM(m.in_area_duration), 0)) AS gps, + SEC_TO_TIME(COALESCE(SUM(m.mission_duration), 0)) AS durations, COALESCE(SUM(CASE WHEN m.type = 1 THEN 1 ELSE 0 END), 0) AS far_h, COALESCE(SUM(CASE WHEN m.type = 2 THEN 1 ELSE 0 END), 0) AS far_d, COALESCE(SUM(CASE WHEN m.type = 3 THEN 1 ELSE 0 END), 0) AS un_far_h, @@ -56,8 +56,8 @@ class ReportTradodService p.id AS province_id, COUNT(m.id) AS total, COALESCE(SUM(m.mission_duration != m.in_area_duration), 0) AS khareg_mahdode, - COALESCE(SUM(m.in_area_duration), 0) AS gps, - COALESCE(SUM(m.mission_duration), 0) AS durations, + SEC_TO_TIME(COALESCE(SUM(m.in_area_duration), 0)) AS gps, + SEC_TO_TIME(COALESCE(SUM(m.mission_duration), 0)) AS durations, COALESCE(SUM(CASE WHEN m.type = 1 THEN 1 ELSE 0 END), 0) AS far_h, COALESCE(SUM(CASE WHEN m.type = 2 THEN 1 ELSE 0 END), 0) AS far_d, COALESCE(SUM(CASE WHEN m.type = 3 THEN 1 ELSE 0 END), 0) AS un_far_h, @@ -98,8 +98,8 @@ class ReportTradodService -1 AS city_id, COUNT(m.id) AS total, COALESCE(SUM(m.mission_duration != m.in_area_duration), 0) AS khareg_mahdode, - COALESCE(SUM(m.in_area_duration), 0) AS gps, - COALESCE(SUM(m.mission_duration), 0) AS durations, + SEC_TO_TIME(COALESCE(SUM(m.in_area_duration), 0)) AS gps, + SEC_TO_TIME(COALESCE(SUM(m.mission_duration), 0)) AS durations, COALESCE(SUM(m.type = 1), 0) AS far_h, COALESCE(SUM(m.type = 2), 0) AS far_d, COALESCE(SUM(m.type = 3), 0) AS un_far_h, @@ -118,8 +118,8 @@ class ReportTradodService c.id AS city_id, COUNT(m.id) AS total, COALESCE(SUM(m.mission_duration != m.in_area_duration), 0) AS khareg_mahdode, - COALESCE(SUM(m.in_area_duration), 0) AS gps, - COALESCE(SUM(m.mission_duration), 0) AS durations, + SEC_TO_TIME(COALESCE(SUM(m.in_area_duration), 0)) AS gps, + SEC_TO_TIME(COALESCE(SUM(m.mission_duration), 0)) AS durations, COALESCE(SUM(m.type = 1), 0) AS far_h, COALESCE(SUM(m.type = 2), 0) AS far_d, COALESCE(SUM(m.type = 3), 0) AS un_far_h,