RMS/backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request 'debug the reports' (#4) from bugfix/MissionReport into develop

Browse Source 
Reviewed-on: http://git.witel.ir/RMS/Backend/pulls/4
This commit is contained in:
amirghasempoor
2026-01-27 08:02:49 +00:00
parent 5b678cd938 ad03609c3d
commit d662ff6517
5 changed files with 214 additions and 269 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/Http/Controllers/V3/Dashboard/Mission/Report/ReportTradodController.php
View File

@@ -31,7 +31,13 @@ class ReportTradodController extends Controller
{ {
return $this->successResponse([ return $this->successResponse([
'activities' =>$reportMissionService->provinceActivity($request), 'activities' =>$reportMissionService->provinceActivity($request),
'city' => City::query()->where('province_id', $request->province_id)->get(['id', 'name_fa']), 'city' => City::query()
->where('province_id', $request->province_id)
->where(function ($query) {
$query->where('type_id', 1)
->orWhereIn('name_fa', ['اداره ماشين‌آلات', 'اداره نقلیه']);
})
->get(['id', 'name_fa'])
]); ]);
} }

8
app/Http/Controllers/V3/Dashboard/Mission/Report/ReportViolationController.php
View File

@@ -31,7 +31,13 @@ class ReportViolationController extends Controller
{ {
return $this->successResponse([ return $this->successResponse([
'activities' =>$reportService->provinceActivity($request), 'activities' =>$reportService->provinceActivity($request),
'city' => City::query()->where('province_id', $request->province_id)->get(['id', 'name_fa']), 'city' => City::query()
->where('province_id', $request->province_id)
->where(function ($query) {
$query->where('type_id', 1)
->orWhereIn('name_fa', ['اداره ماشين‌آلات', 'اداره نقلیه']);
})
->get(['id', 'name_fa'])
]); ]);
} }

256
app/Services/Cartables/Mission/Report/ReportTradodService.php
View File

@@ -27,76 +27,60 @@ class ReportTradodService
public function countryActivity(Request $request): array public function countryActivity(Request $request): array
{ {
$from = $request->from_date ?? today()->startOfDay(); $from = $request->from_date ?? today()->startOfDay();
$to = Carbon::parse($request->to_date)->endOfDay() ?? today()->endOfDay(); $to = $request->to_date ? Carbon::parse($request->to_date)->endOfDay() : today()->endOfDay();
$sql = "
SELECT*
FROM(
SELECT
'کل کشور' AS province_name,
-1 AS province_id,
SUM(t.total) AS total,
SUM(t.khareg_mahdode) AS khareg_mahdode,
SUM(t.gps) AS gps,
SUM(t.durations) AS durations,
SUM(t.far_h) AS far_h,
SUM(t.far_d) AS far_d,
SUM(t.un_far_h) AS un_far_h,
SUM(t.un_far_d) AS un_far_d,
SUM(t.item) AS item,
SUM(t.patrol) AS patrol
FROM (
SELECT
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,
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,
COALESCE(SUM(CASE WHEN m.type = 4 THEN 1 ELSE 0 END), 0) AS un_far_d,
COALESCE(SUM(CASE WHEN m.category_id = 1 THEN 1 ELSE 0 END), 0) AS item,
COALESCE(SUM(CASE WHEN m.category_id = 2 THEN 1 ELSE 0 END), 0) AS patrol
FROM provinces p
LEFT JOIN missions m
ON m.province_id = p.id
AND m.created_at >= :from_m
AND m.created_at <= :to_m
GROUP BY p.id
) t
UNION ALL
SELECT
p.name_fa AS province_name,
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,
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,
COALESCE(SUM(CASE WHEN m.type = 4 THEN 1 ELSE 0 END), 0) AS un_far_d,
COALESCE(SUM(CASE WHEN m.category_id = 1 THEN 1 ELSE 0 END), 0) AS item,
COALESCE(SUM(CASE WHEN m.category_id = 2 THEN 1 ELSE 0 END), 0) AS patrol
FROM provinces p
LEFT JOIN missions m
ON m.province_id = p.id
AND m.created_at >= :from_m
AND m.created_at <= :to_m
GROUP BY p.id, p.name_fa
)q
ORDER BY
CASE WHEN province_id = -1 THEN 0 ELSE 1 END,
province_name;
";
$sql = "
SELECT*
FROM(
SELECT
'کل کشور' AS province_name,
-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,
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,
COALESCE(SUM(CASE WHEN m.type = 4 THEN 1 ELSE 0 END), 0) AS un_far_d,
COALESCE(SUM(CASE WHEN m.category_id = 1 THEN 1 ELSE 0 END), 0) AS item,
COALESCE(SUM(CASE WHEN m.category_id = 2 THEN 1 ELSE 0 END), 0) AS patrol
FROM missions m
WHERE m.created_at >= :from_m_1
AND m.created_at <= :to_m_1
UNION ALL
SELECT
p.name_fa AS province_name,
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,
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,
COALESCE(SUM(CASE WHEN m.type = 4 THEN 1 ELSE 0 END), 0) AS un_far_d,
COALESCE(SUM(CASE WHEN m.category_id = 1 THEN 1 ELSE 0 END), 0) AS item,
COALESCE(SUM(CASE WHEN m.category_id = 2 THEN 1 ELSE 0 END), 0) AS patrol
FROM provinces p
LEFT JOIN missions m
ON m.province_id = p.id
AND m.created_at >= :from_m_2
AND m.created_at <= :to_m_2
GROUP BY p.id, p.name_fa
) q
ORDER BY
CASE WHEN province_id = -1 THEN 0 ELSE 1 END,
province_name;
";
return DB::select($sql, [ return DB::select($sql, [
'from_m' => $from, 'from_m_1' => $from,
'to_m' => $to, 'to_m_1' => $to,
'from_m_2' => $from,
'to_m_2' => $to,
]); ]);
} }
@@ -104,90 +88,68 @@ class ReportTradodService
{ {
$provinceId = $request->province_id ?? auth()->user()->province_id; $provinceId = $request->province_id ?? auth()->user()->province_id;
$from = $request->from_date ?? today()->startOfDay(); $from = $request->from_date ?? today()->startOfDay();
$to = Carbon::parse($request->to_date)->endOfDay() ?? today()->endOfDay(); $to = $request->to_date ? Carbon::parse($request->to_date)->endOfDay() : today()->endOfDay();
$sql = " $sql = "
SELECT* SELECT*
FROM( FROM(
SELECT SELECT
'کل استان' AS city_name, 'کل استان' AS city_name,
-1 AS city_id, -1 AS city_id,
SUM(t.total) AS total, COUNT(m.id) AS total,
SUM(t.khareg_mahdode) AS khareg_mahdode, COALESCE(SUM(m.mission_duration != m.in_area_duration), 0) AS khareg_mahdode,
SUM(t.gps) AS gps, COALESCE(SUM(m.in_area_duration), 0) AS gps,
SUM(t.durations) AS durations, COALESCE(SUM(m.mission_duration), 0) AS durations,
SUM(t.far_h) AS far_h, COALESCE(SUM(m.type = 1), 0) AS far_h,
SUM(t.far_d) AS far_d, COALESCE(SUM(m.type = 2), 0) AS far_d,
SUM(t.un_far_h) AS un_far_h, COALESCE(SUM(m.type = 3), 0) AS un_far_h,
SUM(t.un_far_d) AS un_far_d, COALESCE(SUM(m.type = 4), 0) AS un_far_d,
SUM(t.item) AS item, COALESCE(SUM(m.category_id = 1), 0) AS item,
SUM(t.patrol) AS patrol COALESCE(SUM(m.category_id = 2), 0) AS patrol
FROM ( FROM missions m
SELECT WHERE m.created_at >= :from_m_1
c.id AS city_id, AND m.created_at <= :to_m_1
AND m.province_id = :province_id_1
COUNT(m.id) AS total,
COALESCE(SUM(m.mission_duration != m.in_area_duration), 0) AS khareg_mahdode, UNION ALL
COALESCE(SUM(m.in_area_duration), 0) AS gps,
COALESCE(SUM(m.mission_duration), 0) AS durations, SELECT
COALESCE(SUM(m.type = 1), 0) AS far_h, c.name_fa AS city_name,
COALESCE(SUM(m.type = 2), 0) AS far_d, c.id AS city_id,
COALESCE(SUM(m.type = 3), 0) AS un_far_h, COUNT(m.id) AS total,
COALESCE(SUM(m.type = 4), 0) AS un_far_d, COALESCE(SUM(m.mission_duration != m.in_area_duration), 0) AS khareg_mahdode,
COALESCE(SUM(m.category_id = 1), 0) AS item, COALESCE(SUM(m.in_area_duration), 0) AS gps,
COALESCE(SUM(m.category_id = 2), 0) AS patrol COALESCE(SUM(m.mission_duration), 0) AS durations,
FROM cities c COALESCE(SUM(m.type = 1), 0) AS far_h,
LEFT JOIN missions m COALESCE(SUM(m.type = 2), 0) AS far_d,
ON m.city_id = c.id COALESCE(SUM(m.type = 3), 0) AS un_far_h,
AND m.created_at >= :from_m COALESCE(SUM(m.type = 4), 0) AS un_far_d,
AND m.created_at <= :to_m COALESCE(SUM(m.category_id = 1), 0) AS item,
WHERE c.province_id = :province_id COALESCE(SUM(m.category_id = 2), 0) AS patrol
AND ( FROM cities c
c.type_id = 1 LEFT JOIN missions m
OR c.name_fa IN ('اداره ماشين‌آلات', 'اداره نقلیه') ON m.city_id = c.id
) AND m.created_at >= :from_m_2
GROUP BY c.id AND m.created_at <= :to_m_2
) t WHERE c.province_id = :province_id_2
AND (
UNION ALL c.type_id = 1
OR c.name_fa IN ('اداره ماشين‌آلات', 'اداره نقلیه')
SELECT )
c.name_fa AS city_name, GROUP BY c.id, c.name_fa
c.id AS city_id, ) q
ORDER BY
COUNT(m.id) AS total, CASE WHEN q.city_id = -1 THEN 0 ELSE 1 END,
COALESCE(SUM(m.mission_duration != m.in_area_duration), 0) AS khareg_mahdode, q.city_name;
COALESCE(SUM(m.in_area_duration), 0) AS gps, ";
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,
COALESCE(SUM(m.type = 4), 0) AS un_far_d,
COALESCE(SUM(m.category_id = 1), 0) AS item,
COALESCE(SUM(m.category_id = 2), 0) AS patrol
FROM cities c
LEFT JOIN missions m
ON m.city_id = c.id
AND m.created_at >= :from_m
AND m.created_at <= :to_m
WHERE c.province_id = :province_id
AND (
c.type_id = 1
OR c.name_fa IN ('اداره ماشين‌آلات', 'اداره نقلیه')
)
GROUP BY c.id, c.name_fa
) q
ORDER BY
CASE WHEN q.city_id = -1 THEN 0 ELSE 1 END,
q.city_name;
";
return DB::select($sql, [ return DB::select($sql, [
'province_id' => $provinceId, 'province_id_1' => $provinceId,
'from_m' => $from, 'from_m_1' => $from,
'to_m' => $to, 'to_m_1' => $to,
'province_id_2' => $provinceId,
'from_m_2' => $from,
'to_m_2' => $to,
]); ]);
} }
} }

207
app/Services/Cartables/Mission/Report/ReportViolationService.php
View File

@@ -27,67 +27,53 @@ class ReportViolationService
public function countryActivity(Request $request): array public function countryActivity(Request $request): array
{ {
$from = $request->from_date ?? today()->startOfDay(); $from = $request->from_date ?? today()->startOfDay();
$to = Carbon::parse($request->to_date)->endOfDay() ?? today()->endOfDay(); $to = $request->to_date ? Carbon::parse($request->to_date)->endOfDay() : today()->endOfDay();
$sql = " $sql = "
SELECT* SELECT*
FROM( FROM(
SELECT SELECT
'کل کشور' AS province_name, 'کل کشور' AS province_name,
-1 AS province_id, -1 AS province_id,
SUM(t.total) AS total, COUNT(mv.id) AS total,
SUM(t.done) AS done, COALESCE(SUM(CASE WHEN mv.status = 1 THEN 1 ELSE 0 END), 0) as done,
SUM(t.undone) AS undone, COALESCE(SUM(CASE WHEN mv.status = 0 THEN 1 ELSE 0 END), 0) as undone,
SUM(t.gps) AS gps, COALESCE(SUM(CASE WHEN gps = 1 THEN 1 ELSE 0 END), 0) as gps,
SUM(t.herasat) AS herasat, COALESCE(SUM(CASE WHEN gps = 0 THEN 1 ELSE 0 END), 0) as herasat,
SUM(t.mil_gps) AS mil_gps COALESCE(SUM(CASE WHEN gps = 1 THEN mileage ELSE 0 END),0) as mil_gps
FROM ( FROM mission_violations mv
SELECT WHERE mv.created_at >= :from_mv_1
p.id AS province_id, AND mv.created_at <= :to_mv_1
COUNT(mv.id) AS total,
COALESCE(SUM(CASE WHEN mv.status = 1 THEN 1 ELSE 0 END), 0) as done, UNION ALL
COALESCE(SUM(CASE WHEN mv.status = 0 THEN 1 ELSE 0 END), 0) as undone,
COALESCE(SUM(CASE WHEN gps = 1 THEN 1 ELSE 0 END), 0) as gps, SELECT
COALESCE(SUM(CASE WHEN gps = 0 THEN 1 ELSE 0 END), 0) as herasat, p.name_fa AS province_name,
COALESCE(SUM(CASE WHEN gps = 1 THEN mileage ELSE 0 END),0) as mil_gps p.id AS province_id,
COUNT(mv.id) AS total,
COALESCE(SUM(CASE WHEN mv.status = 1 THEN 1 ELSE 0 END), 0) as done,
COALESCE(SUM(CASE WHEN mv.status = 0 THEN 1 ELSE 0 END), 0) as undone,
COALESCE(SUM(CASE WHEN gps = 1 THEN 1 ELSE 0 END), 0) as gps,
COALESCE(SUM(CASE WHEN gps = 0 THEN 1 ELSE 0 END), 0) as herasat,
COALESCE(SUM(CASE WHEN gps = 1 THEN mileage ELSE 0 END),0) as mil_gps
FROM provinces p FROM provinces p
LEFT JOIN mission_violations mv
ON mv.province_id = p.id
AND mv.type = 1
AND mv.created_at >= :from_mv
AND mv.created_at <= :to_mv
GROUP BY p.id
) t
UNION ALL
SELECT
p.name_fa AS province_name,
p.id AS province_id,
COUNT(mv.id) AS total,
COALESCE(SUM(CASE WHEN mv.status = 1 THEN 1 ELSE 0 END), 0) as done,
COALESCE(SUM(CASE WHEN mv.status = 0 THEN 1 ELSE 0 END), 0) as undone,
COALESCE(SUM(CASE WHEN gps = 1 THEN 1 ELSE 0 END), 0) as gps,
COALESCE(SUM(CASE WHEN gps = 0 THEN 1 ELSE 0 END), 0) as herasat,
COALESCE(SUM(CASE WHEN gps = 1 THEN mileage ELSE 0 END),0) as mil_gps
FROM provinces p
LEFT JOIN mission_violations mv LEFT JOIN mission_violations mv
ON mv.province_id = p.id ON mv.province_id = p.id
AND mv.type = 1 AND mv.type = 1
AND mv.created_at >= :from_mv AND mv.created_at >= :from_mv_2
AND mv.created_at <= :to_mv AND mv.created_at <= :to_mv_2
GROUP BY p.id, p.name_fa GROUP BY p.id, p.name_fa
)q ) q
ORDER BY ORDER BY
CASE WHEN province_id = -1 THEN 0 ELSE 1 END, CASE WHEN province_id = -1 THEN 0 ELSE 1 END,
province_name; province_name;
";
";
return DB::select($sql, [ return DB::select($sql, [
'from_mv' => $from, 'from_mv_1' => $from,
'to_mv' => $to, 'to_mv_1' => $to,
'from_mv_2' => $from,
'to_mv_2' => $to,
]); ]);
} }
@@ -95,77 +81,62 @@ class ReportViolationService
{ {
$provinceId = $request->province_id ?? auth()->user()->province_id; $provinceId = $request->province_id ?? auth()->user()->province_id;
$from = $request->from_date ?? today()->startOfDay(); $from = $request->from_date ?? today()->startOfDay();
$to = Carbon::parse($request->to_date)->endOfDay() ?? today()->endOfDay(); $to = $request->to_date ? Carbon::parse($request->to_date)->endOfDay() : today()->endOfDay();
$sql = " $sql = "
SELECT* SELECT*
FROM( FROM(
SELECT SELECT
'کل استان' AS city_name, 'کل استان' AS city_name,
-1 AS city_id, -1 AS city_id,
SUM(t.total) AS total, COUNT(mv.id) AS total,
SUM(t.done) AS done, COALESCE(SUM(mv.status = 1), 0) AS done,
SUM(t.undone) AS undone, COALESCE(SUM(mv.status = 0), 0) AS undone,
SUM(t.gps) AS gps, COALESCE(SUM(mv.gps = 1), 0) AS gps,
SUM(t.herasat) AS herasat, COALESCE(SUM(mv.gps = 0), 0) AS herasat,
SUM(t.mil_gps) AS mil_gps COALESCE(SUM(CASE WHEN mv.gps = 1 THEN mv.mileage ELSE 0 END), 0) AS mil_gps
FROM ( FROM mission_violations mv
SELECT WHERE mv.type = 1
c.id AS city_id, AND mv.created_at >= :from_mv_1
COUNT(mv.id) AS total, AND mv.created_at <= :to_mv_1
COALESCE(SUM(mv.status = 1), 0) AS done, AND mv.province_id = :province_id_1
COALESCE(SUM(mv.status = 0), 0) AS undone,
COALESCE(SUM(mv.gps = 1), 0) AS gps, UNION ALL
COALESCE(SUM(mv.gps = 0), 0) AS herasat,
COALESCE(SUM(CASE WHEN mv.gps = 1 THEN mv.mileage ELSE 0 END), 0) AS mil_gps SELECT
FROM cities c c.name_fa AS city_name,
LEFT JOIN mission_violations mv c.id AS city_id,
ON mv.city_id = c.id COUNT(mv.id) AS total,
AND mv.type = 1 COALESCE(SUM(mv.status = 1), 0) AS done,
AND mv.created_at >= :from_mv COALESCE(SUM(mv.status = 0), 0) AS undone,
AND mv.created_at <= :to_mv COALESCE(SUM(mv.gps = 1), 0) AS gps,
WHERE c.province_id = :province_id COALESCE(SUM(mv.gps = 0), 0) AS herasat,
AND ( COALESCE(SUM(CASE WHEN mv.gps = 1 THEN mv.mileage ELSE 0 END), 0) AS mil_gps
c.type_id = 1 FROM cities c
OR c.name_fa IN ('اداره ماشين‌آلات', 'اداره نقلیه') LEFT JOIN mission_violations mv
) ON mv.city_id = c.id
GROUP BY c.id AND mv.type = 1
) t AND mv.created_at >= :from_mv_2
AND mv.created_at <= :to_mv_2
UNION ALL WHERE c.province_id = :province_id_2
AND (
SELECT c.type_id = 1
c.name_fa AS city_name, OR c.name_fa IN ('اداره ماشين‌آلات', 'اداره نقلیه')
c.id AS city_id, )
COUNT(mv.id) AS total, GROUP BY c.id, c.name_fa
COALESCE(SUM(mv.status = 1), 0) AS done, ) q
COALESCE(SUM(mv.status = 0), 0) AS undone, ORDER BY
COALESCE(SUM(mv.gps = 1), 0) AS gps, CASE WHEN q.city_id = -1 THEN 0 ELSE 1 END,
COALESCE(SUM(mv.gps = 0), 0) AS herasat, q.city_name;
COALESCE(SUM(CASE WHEN mv.gps = 1 THEN mv.mileage ELSE 0 END), 0) AS mil_gps
FROM cities c
LEFT JOIN mission_violations mv
ON mv.city_id = c.id
AND mv.type = 1
AND mv.created_at >= :from_mv
AND mv.created_at <= :to_mv
WHERE c.province_id = :province_id
AND (
c.type_id = 1
OR c.name_fa IN ('اداره ماشين‌آلات', 'اداره نقلیه')
)
GROUP BY c.id, c.name_fa
) q
ORDER BY
CASE WHEN q.city_id = -1 THEN 0 ELSE 1 END,
q.city_name;
"; ";
return DB::select($sql, [ return DB::select($sql, [
'province_id' => $provinceId, 'province_id_1' => $provinceId,
'from_mv' => $from, 'from_mv_1' => $from,
'to_mv' => $to, 'to_mv_1' => $to,
'province_id_2' => $provinceId,
'from_mv_2' => $from,
'to_mv_2' => $to,
]); ]);
} }
} }

4
routes/v3.php
View File

@@ -546,8 +546,8 @@ Route::prefix('missions')
Route::get('/country_excel_activity', 'countryExcelActivity')->name('countryExcelActivity'); Route::get('/country_excel_activity', 'countryExcelActivity')->name('countryExcelActivity');
Route::get('/province_excel_activity', 'provinceExcelActivity')->name('provinceExcelActivity'); Route::get('/province_excel_activity', 'provinceExcelActivity')->name('provinceExcelActivity');
}); });
Route::prefix('report_tradod') Route::prefix('report_taradod')
->name('reportsTradod.') ->name('reportsTaradod.')
->controller(ReportTradodController::class) ->controller(ReportTradodController::class)
->group(function () { ->group(function () {
Route::get('/country_activity', 'countryActivity')->name('countryActivity') Route::get('/country_activity', 'countryActivity')->name('countryActivity')