This commit is contained in:
2025-08-19 14:35:16 +03:30
parent d350f2666d
commit 39d30b8aa7
5 changed files with 72 additions and 48 deletions

View File

@@ -49,11 +49,11 @@ class OperatorService
) s
),
provinces AS (
SELECT DISTINCT province_fa FROM safety_and_privacy WHERE info_id = ?
SELECT DISTINCT province_id FROM safety_and_privacy WHERE info_id = ?
),
data AS (
SELECT
p.province_fa,
p.province_id,
c.axis_type_id,
c.step,
COUNT(sp.id) AS total
@@ -62,18 +62,18 @@ class OperatorService
LEFT JOIN safety_and_privacy sp
ON sp.axis_type_id = c.axis_type_id
AND sp.step = c.step
AND sp.province_fa = p.province_fa
AND sp.province_id = p.province_id
AND sp.info_id = ?
GROUP BY p.province_fa, c.axis_type_id, c.step
GROUP BY p.province_id, c.axis_type_id, c.step
)
SELECT
province_fa,
province_id,
axis_type_id,
step,
total,
SUM(total) OVER (PARTITION BY province_fa) AS total_sum
SUM(total) OVER (PARTITION BY province_id) AS total_sum
FROM data
ORDER BY province_fa, axis_type_id, step
ORDER BY province_id, axis_type_id, step
", [$info_id, $info_id]);
}
@@ -90,7 +90,7 @@ class OperatorService
) s
),
edarat AS (
SELECT id AS edare_id, name_fa
SELECT id AS edare_id
FROM edarate_shahri
WHERE province_id = :provinceId
),
@@ -111,7 +111,6 @@ class OperatorService
)
SELECT
e.edare_id,
e.name_fa AS edare_name,
d.axis_type_id,
d.step,
d.total,
@@ -124,5 +123,4 @@ class OperatorService
'infoId' => $info_id,
]);
}
}