create and fix

This commit is contained in:
2025-08-26 17:11:48 +03:30
parent 53e35d3783
commit cb8b9683a3
7 changed files with 121 additions and 82 deletions

View File

@@ -37,88 +37,68 @@ class OperatorService
public function countryActivity(int $info_id): array
{
return DB::select("
WITH combinations AS (
SELECT
axis_type_id,
step
FROM (
SELECT 1 AS axis_type_id UNION ALL SELECT 2 UNION ALL SELECT 3 UNION ALL SELECT 4 UNION ALL SELECT 5
) a
CROSS JOIN (
SELECT 1 AS step UNION ALL SELECT 2 UNION ALL SELECT 3
) s
),
provinces AS (
SELECT DISTINCT province_id FROM safety_and_privacy WHERE info_id = ?
),
data AS (
SELECT
p.province_id,
c.axis_type_id,
c.step,
COUNT(sp.id) AS total
FROM combinations c
CROSS JOIN provinces p
LEFT JOIN safety_and_privacy sp
ON sp.axis_type_id = c.axis_type_id
AND sp.step = c.step
AND sp.province_id = p.province_id
AND sp.info_id = ?
GROUP BY p.province_id, c.axis_type_id, c.step
)
SELECT
province_id,
WITH province_data AS (
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
FROM provinces p
CROSS JOIN axis_types a
LEFT JOIN safety_and_privacy t
ON p.id = t.province_id
AND a.id = t.axis_type_id
AND t.info_id = :infoId
GROUP BY p.id, a.id
)
SELECT * FROM province_data
UNION ALL
SELECT
-1 AS province_id,
axis_type_id,
step,
total,
SUM(total) OVER (PARTITION BY province_id) AS total_sum
FROM data
ORDER BY province_id, axis_type_id, step
", [$info_id, $info_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
FROM province_data
GROUP BY axis_type_id
ORDER BY province_id, axis_type_id
", [
'infoId' => $info_id,
]);
}
public function provinceActivity(int $info_id, int $province_id): array
{
return DB::select("
WITH combinations AS (
SELECT axis_type_id, step
FROM (
SELECT 1 AS axis_type_id UNION ALL SELECT 2 UNION ALL SELECT 3 UNION ALL SELECT 4 UNION ALL SELECT 5
) a
CROSS JOIN (
SELECT 1 AS step UNION ALL SELECT 2 UNION ALL SELECT 3
) s
),
edarat AS (
SELECT id AS edare_id
FROM edarate_shahri
WHERE province_id = :provinceId
),
data AS (
SELECT
e.edare_id,
c.axis_type_id,
c.step,
COUNT(sp.id) AS total
FROM combinations c
CROSS JOIN edarat e
LEFT JOIN safety_and_privacy sp
ON sp.axis_type_id = c.axis_type_id
AND sp.step = c.step
AND sp.city_id = e.edare_id
AND sp.info_id = :infoId
GROUP BY e.edare_id, c.axis_type_id, c.step
)
SELECT
e.edare_id,
d.axis_type_id,
d.step,
d.total,
SUM(d.total) OVER (PARTITION BY e.edare_id) AS total_sum
FROM data d
JOIN edarat e ON e.edare_id = d.edare_id
ORDER BY e.edare_id, d.axis_type_id, d.step
",[
WITH edareh_data AS (
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
FROM edarate_shahri e
CROSS JOIN axis_types a
LEFT JOIN safety_and_privacy t
ON e.id = t.edare_shahri_id
AND a.id = t.axis_type_id
AND t.info_id = :infoId
WHERE e.province_id = :provinceId
GROUP BY e.id, a.id
)
SELECT * FROM edareh_data
UNION ALL
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
FROM edareh_data
GROUP BY axis_type_id
ORDER BY edareh_id, axis_type_id
", [
'provinceId' => $province_id,
'infoId' => $info_id,
]);