From 3049556f0c1904702fb39e4a3169db2f769f10e7 Mon Sep 17 00:00:00 2001 From: joddyabott Date: Wed, 27 Aug 2025 09:22:22 +0330 Subject: [PATCH] fix code --- .../SafetyAndPrivacy/OperatorService.php | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/app/Services/Cartables/SafetyAndPrivacy/OperatorService.php b/app/Services/Cartables/SafetyAndPrivacy/OperatorService.php index 8c9c0e9d..e8053d43 100644 --- a/app/Services/Cartables/SafetyAndPrivacy/OperatorService.php +++ b/app/Services/Cartables/SafetyAndPrivacy/OperatorService.php @@ -41,9 +41,9 @@ class OperatorService SELECT p.id AS province_id, a.id AS axis_type_id, - SUM(CASE WHEN t.step = 1 THEN 1 ELSE 0 END) AS step_1_count, - SUM(CASE WHEN t.step = 2 THEN 1 ELSE 0 END) AS step_2_count, - SUM(CASE WHEN t.step = 3 THEN 1 ELSE 0 END) AS step_3_count + SUM(CASE WHEN t.step = 1 THEN 1 ELSE 0 END) AS s1, + SUM(CASE WHEN t.step = 2 THEN 1 ELSE 0 END) AS c2, + SUM(CASE WHEN t.step = 3 THEN 1 ELSE 0 END) AS c3 FROM provinces p CROSS JOIN axis_types a LEFT JOIN safety_and_privacy t @@ -57,9 +57,9 @@ class OperatorService SELECT -1 AS province_id, axis_type_id, - SUM(step_1_count) AS step_1_count, - SUM(step_2_count) AS step_2_count, - SUM(step_3_count) AS step_3_count + SUM(s1) AS s1, + SUM(c2) AS c2, + SUM(c3) AS c3 FROM province_data GROUP BY axis_type_id ORDER BY province_id, axis_type_id @@ -75,9 +75,9 @@ class OperatorService SELECT e.id AS edareh_id, a.id AS axis_type_id, - SUM(CASE WHEN t.step = 1 THEN 1 ELSE 0 END) AS step_1_count, - SUM(CASE WHEN t.step = 2 THEN 1 ELSE 0 END) AS step_2_count, - SUM(CASE WHEN t.step = 3 THEN 1 ELSE 0 END) AS step_3_count + SUM(CASE WHEN t.step = 1 THEN 1 ELSE 0 END) AS c1, + SUM(CASE WHEN t.step = 2 THEN 1 ELSE 0 END) AS c2, + SUM(CASE WHEN t.step = 3 THEN 1 ELSE 0 END) AS c3 FROM edarate_shahri e CROSS JOIN axis_types a LEFT JOIN safety_and_privacy t @@ -92,9 +92,9 @@ class OperatorService SELECT -1 AS edareh_id, axis_type_id, - SUM(step_1_count) AS step_1_count, - SUM(step_2_count) AS step_2_count, - SUM(step_3_count) AS step_3_count + SUM(s1) AS s1, + SUM(c2) AS c2, + SUM(c3) AS c3 FROM edareh_data GROUP BY axis_type_id ORDER BY edareh_id, axis_type_id