This commit is contained in:
2025-08-27 09:22:22 +03:30
parent cb8b9683a3
commit 3049556f0c

View File

@@ -41,9 +41,9 @@ class OperatorService
SELECT SELECT
p.id AS province_id, p.id AS province_id,
a.id AS axis_type_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 = 1 THEN 1 ELSE 0 END) AS s1,
SUM(CASE WHEN t.step = 2 THEN 1 ELSE 0 END) AS step_2_count, 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 step_3_count SUM(CASE WHEN t.step = 3 THEN 1 ELSE 0 END) AS c3
FROM provinces p FROM provinces p
CROSS JOIN axis_types a CROSS JOIN axis_types a
LEFT JOIN safety_and_privacy t LEFT JOIN safety_and_privacy t
@@ -57,9 +57,9 @@ class OperatorService
SELECT SELECT
-1 AS province_id, -1 AS province_id,
axis_type_id, axis_type_id,
SUM(step_1_count) AS step_1_count, SUM(s1) AS s1,
SUM(step_2_count) AS step_2_count, SUM(c2) AS c2,
SUM(step_3_count) AS step_3_count SUM(c3) AS c3
FROM province_data FROM province_data
GROUP BY axis_type_id GROUP BY axis_type_id
ORDER BY province_id, axis_type_id ORDER BY province_id, axis_type_id
@@ -75,9 +75,9 @@ class OperatorService
SELECT SELECT
e.id AS edareh_id, e.id AS edareh_id,
a.id AS axis_type_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 = 1 THEN 1 ELSE 0 END) AS c1,
SUM(CASE WHEN t.step = 2 THEN 1 ELSE 0 END) AS step_2_count, 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 step_3_count SUM(CASE WHEN t.step = 3 THEN 1 ELSE 0 END) AS c3
FROM edarate_shahri e FROM edarate_shahri e
CROSS JOIN axis_types a CROSS JOIN axis_types a
LEFT JOIN safety_and_privacy t LEFT JOIN safety_and_privacy t
@@ -92,9 +92,9 @@ class OperatorService
SELECT SELECT
-1 AS edareh_id, -1 AS edareh_id,
axis_type_id, axis_type_id,
SUM(step_1_count) AS step_1_count, SUM(s1) AS s1,
SUM(step_2_count) AS step_2_count, SUM(c2) AS c2,
SUM(step_3_count) AS step_3_count SUM(c3) AS c3
FROM edareh_data FROM edareh_data
GROUP BY axis_type_id GROUP BY axis_type_id
ORDER BY edareh_id, axis_type_id ORDER BY edareh_id, axis_type_id