Merge pull request #129 from witelgroup/feature/MissionReports

Feature/mission reports
This commit is contained in:
Amir Ghasempoor
2026-01-31 09:29:18 +03:30
committed by GitHub
13 changed files with 242 additions and 297 deletions

View File

@@ -69,7 +69,7 @@ class CountryReport implements FromView, ShouldAutoSize, WithDrawings, WithEvent
$exportRows[] = $row; $exportRows[] = $row;
} }
return view('v3.Reports.Mission.Report.CountryActivityReport', [ return view('v3.Reports.Mission.Report.Tradod .CountryActivityReport', [
'rows' => $exportRows, 'rows' => $exportRows,
]); ]);
} }

View File

@@ -71,7 +71,7 @@ class ProvinceReport implements FromView, ShouldAutoSize, WithDrawings, WithEven
$exportRows[] = $row; $exportRows[] = $row;
} }
return view('v3.Reports.Mission.Report.ProvinceActivityReport', [ return view('v3.Reports.Mission.Report.Tradod .ProvinceActivityReport', [
'rows' => $exportRows, 'rows' => $exportRows,
]); ]);
} }

View File

@@ -30,7 +30,7 @@ class CountryReport implements FromView, ShouldAutoSize, WithDrawings, WithEvent
'province_name' => $name, 'province_name' => $name,
'total' => (int) ($r->total ?? 0), 'total' => (int) ($r->total ?? 0),
'egdam_shode' => (int) ($r->done ?? 0), 'egdam_shode' => (int) ($r->done ?? 0),
'bedone_egdam' => (int) ($r->undon ?? 0), 'bedone_egdam' => (int) ($r->undone ?? 0),
'sabt_gps' => (int) ($r->gps ?? 0), 'sabt_gps' => (int) ($r->gps ?? 0),
'sabt_herasat' => (int) ($r->herasat ?? 0), 'sabt_herasat' => (int) ($r->herasat ?? 0),
'mil_gps' => (int) ($r->mil_gps ?? 0), 'mil_gps' => (int) ($r->mil_gps ?? 0),
@@ -94,7 +94,7 @@ class CountryReport implements FromView, ShouldAutoSize, WithDrawings, WithEvent
$drawing2->setHeight(50); $drawing2->setHeight(50);
$drawing2->setOffsetX(5); $drawing2->setOffsetX(5);
$drawing2->setOffsetY(5); $drawing2->setOffsetY(5);
$drawing2->setCoordinates('E1'); $drawing2->setCoordinates('G1');
return [$drawing, $drawing2]; return [$drawing, $drawing2];
} }

View File

@@ -31,7 +31,7 @@ class ProvinceReport implements FromView, ShouldAutoSize, WithDrawings, WithEven
'city_name' => $name, 'city_name' => $name,
'total' => (int) ($r->total ?? 0), 'total' => (int) ($r->total ?? 0),
'egdam_shode' => (int) ($r->done ?? 0), 'egdam_shode' => (int) ($r->done ?? 0),
'bedone_egdam' => (int) ($r->undon ?? 0), 'bedone_egdam' => (int) ($r->undone ?? 0),
'sabt_gps' => (int) ($r->gps ?? 0), 'sabt_gps' => (int) ($r->gps ?? 0),
'sabt_herasat' => (int) ($r->herasat ?? 0), 'sabt_herasat' => (int) ($r->herasat ?? 0),
'mil_gps' => (int) ($r->mil_gps ?? 0), 'mil_gps' => (int) ($r->mil_gps ?? 0),
@@ -98,7 +98,7 @@ class ProvinceReport implements FromView, ShouldAutoSize, WithDrawings, WithEven
$drawing2->setHeight(50); $drawing2->setHeight(50);
$drawing2->setOffsetX(5); $drawing2->setOffsetX(5);
$drawing2->setOffsetY(5); $drawing2->setOffsetY(5);
$drawing2->setCoordinates('E1'); $drawing2->setCoordinates('G1');
return [$drawing, $drawing2]; return [$drawing, $drawing2];
} }

View File

@@ -2,8 +2,8 @@
namespace App\Http\Controllers\V3\Dashboard\Mission\Report; namespace App\Http\Controllers\V3\Dashboard\Mission\Report;
use App\Exports\V3\Mission\Report\Violation\CountryReport; use App\Exports\V3\Mission\Report\Tradod\CountryReport;
use App\Exports\V3\Mission\Report\Violation\ProvinceReport; use App\Exports\V3\Mission\Report\Tradod\ProvinceReport;
use App\Http\Controllers\Controller; use App\Http\Controllers\Controller;
use App\Http\Traits\ApiResponse; use App\Http\Traits\ApiResponse;
use App\Models\City; use App\Models\City;
@@ -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'])
]); ]);
} }

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'])
]); ]);
} }

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 = " $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(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(CASE WHEN m.type = 1 THEN 1 ELSE 0 END), 0) AS far_h,
SUM(t.far_d) AS far_d, COALESCE(SUM(CASE WHEN m.type = 2 THEN 1 ELSE 0 END), 0) AS far_d,
SUM(t.un_far_h) AS un_far_h, COALESCE(SUM(CASE WHEN m.type = 3 THEN 1 ELSE 0 END), 0) AS un_far_h,
SUM(t.un_far_d) AS un_far_d, COALESCE(SUM(CASE WHEN m.type = 4 THEN 1 ELSE 0 END), 0) AS un_far_d,
SUM(t.item) AS item, COALESCE(SUM(CASE WHEN m.category_id = 1 THEN 1 ELSE 0 END), 0) AS item,
SUM(t.patrol) AS patrol COALESCE(SUM(CASE WHEN m.category_id = 2 THEN 1 ELSE 0 END), 0) AS patrol
FROM ( FROM missions m
SELECT WHERE m.created_at >= :from_m_1
p.id AS province_id, AND m.created_at <= :to_m_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(CASE WHEN m.type = 1 THEN 1 ELSE 0 END), 0) AS far_h, p.name_fa AS province_name,
COALESCE(SUM(CASE WHEN m.type = 2 THEN 1 ELSE 0 END), 0) AS far_d, p.id AS province_id,
COALESCE(SUM(CASE WHEN m.type = 3 THEN 1 ELSE 0 END), 0) AS un_far_h, COUNT(m.id) AS total,
COALESCE(SUM(CASE WHEN m.type = 4 THEN 1 ELSE 0 END), 0) AS un_far_d, COALESCE(SUM(m.mission_duration != m.in_area_duration), 0) AS khareg_mahdode,
COALESCE(SUM(CASE WHEN m.category_id = 1 THEN 1 ELSE 0 END), 0) AS item, COALESCE(SUM(m.in_area_duration), 0) AS gps,
COALESCE(SUM(CASE WHEN m.category_id = 2 THEN 1 ELSE 0 END), 0) AS patrol COALESCE(SUM(m.mission_duration), 0) AS durations,
FROM provinces p COALESCE(SUM(CASE WHEN m.type = 1 THEN 1 ELSE 0 END), 0) AS far_h,
LEFT JOIN missions m 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 ON m.province_id = p.id
AND m.created_at >= :from_m AND m.created_at >= :from_m_2
AND m.created_at <= :to_m AND m.created_at <= :to_m_2
GROUP BY p.id GROUP BY p.id, p.name_fa
) t ) q
ORDER BY
UNION ALL CASE WHEN province_id = -1 THEN 0 ELSE 1 END,
province_name;
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;
";
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, UNION ALL
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(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
) t
UNION ALL SELECT
c.name_fa AS city_name,
SELECT c.id AS city_id,
c.name_fa AS city_name, COUNT(m.id) AS total,
c.id AS city_id, COALESCE(SUM(m.mission_duration != m.in_area_duration), 0) AS khareg_mahdode,
COALESCE(SUM(m.in_area_duration), 0) AS gps,
COUNT(m.id) AS total, COALESCE(SUM(m.mission_duration), 0) AS durations,
COALESCE(SUM(m.mission_duration != m.in_area_duration), 0) AS khareg_mahdode, COALESCE(SUM(m.type = 1), 0) AS far_h,
COALESCE(SUM(m.in_area_duration), 0) AS gps, COALESCE(SUM(m.type = 2), 0) AS far_d,
COALESCE(SUM(m.mission_duration), 0) AS durations, COALESCE(SUM(m.type = 3), 0) AS un_far_h,
COALESCE(SUM(m.type = 1), 0) AS far_h, COALESCE(SUM(m.type = 4), 0) AS un_far_d,
COALESCE(SUM(m.type = 2), 0) AS far_d, COALESCE(SUM(m.category_id = 1), 0) AS item,
COALESCE(SUM(m.type = 3), 0) AS un_far_h, COALESCE(SUM(m.category_id = 2), 0) AS patrol
COALESCE(SUM(m.type = 4), 0) AS un_far_d, FROM cities c
COALESCE(SUM(m.category_id = 1), 0) AS item, LEFT JOIN missions m
COALESCE(SUM(m.category_id = 2), 0) AS patrol ON m.city_id = c.id
AND m.created_at >= :from_m_2
FROM cities c AND m.created_at <= :to_m_2
LEFT JOIN missions m WHERE c.province_id = :province_id_2
ON m.city_id = c.id AND (
AND m.created_at >= :from_m c.type_id = 1
AND m.created_at <= :to_m OR c.name_fa IN ('اداره ماشين‌آلات', 'اداره نقلیه')
WHERE c.province_id = :province_id )
AND ( GROUP BY c.id, c.name_fa
c.type_id = 1 ) q
OR c.name_fa IN ('اداره ماشين‌آلات', 'اداره نقلیه') ORDER BY
) CASE WHEN q.city_id = -1 THEN 0 ELSE 1 END,
GROUP BY c.id, c.name_fa q.city_name;
) 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,
]); ]);
} }
} }

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 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 GROUP BY p.id, p.name_fa
) t ) q
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
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, p.name_fa
)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,
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
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
) t
UNION ALL UNION ALL
SELECT
c.name_fa AS city_name,
c.id AS city_id,
COUNT(mv.id) AS total,
COALESCE(SUM(mv.status = 1), 0) AS done,
COALESCE(SUM(mv.status = 0), 0) AS undone,
COALESCE(SUM(mv.gps = 1), 0) AS gps,
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
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;
SELECT
c.name_fa AS city_name,
c.id AS city_id,
COUNT(mv.id) AS total,
COALESCE(SUM(mv.status = 1), 0) AS done,
COALESCE(SUM(mv.status = 0), 0) AS undone,
COALESCE(SUM(mv.gps = 1), 0) AS gps,
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
FROM cities c
LEFT JOIN mission_violations mv
ON mv.city_id = c.id
AND mv.type = 1
AND mv.created_at >= :from_mv_2
AND mv.created_at <= :to_mv_2
WHERE c.province_id = :province_id_2
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,
]); ]);
} }
} }

View File

@@ -5,7 +5,7 @@
<meta charset="UTF-8"> <meta charset="UTF-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge"> <meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1.0"> <meta name="viewport" content="width=device-width, initial-scale=1.0">
<title> گزارش کل کشور </title> <title>گزارش کل کشور </title>
<style> <style>
table, table,
@@ -27,18 +27,18 @@
<table> <table>
<thead> <thead>
<tr> <tr>
<th colspan="3" <th colspan="7"
style="background-color: #DAEEF3;text-align: center;border-right: 1px solid black;font-weight:bolder;"> style="background-color: #DAEEF3;text-align: center;border-right: 1px solid black;font-weight:bolder;">
تاریخ دریافت گزارش: {{ verta()->now()->format('Y/m/d H:i') }} تاریخ دریافت گزارش: {{ verta()->now()->format('Y/m/d H:i') }}
</th> </th>
</tr> </tr>
<tr> <tr>
<th colspan="3" <th colspan="7"
style="background-color: #DAEEF3;text-align: center;border-right:1px solid black;font-weight:bolder;"> style="background-color: #DAEEF3;text-align: center;border-right:1px solid black;font-weight:bolder;">
</th> </th>
</tr> </tr>
<tr> <tr>
<th colspan="3" <th colspan="7"
style="background-color: #DAEEF3;text-align: center;border-right:1px solid black;font-weight:bolder;font-size: 13px;"> style="background-color: #DAEEF3;text-align: center;border-right:1px solid black;font-weight:bolder;font-size: 13px;">
گزارش نخلف های صورت گرفته گزارش نخلف های صورت گرفته
</th> </th>
@@ -79,7 +79,7 @@
@foreach ($rows as $item) @foreach ($rows as $item)
<tr> <tr>
<td style="border: 1px solid black;text-align: center;">{{ $item['province_name'] ?? '-' }}</td> <td style="border: 1px solid black;text-align: center;">{{ $item['province_name'] ?? '-' }}</td>
<td style="border: 1px solid black;text-align: center;">{{ $item['total_violations'] ?? '-' }}</td> <td style="border: 1px solid black;text-align: center;">{{ $item['total'] ?? '-' }}</td>
<td style="border: 1px solid black;text-align: center;">{{ $item['egdam_shode'] ?? '-' }}</td> <td style="border: 1px solid black;text-align: center;">{{ $item['egdam_shode'] ?? '-' }}</td>
<td style="border: 1px solid black;text-align: center;">{{ $item['bedone_egdam'] ?? '-' }}</td> <td style="border: 1px solid black;text-align: center;">{{ $item['bedone_egdam'] ?? '-' }}</td>
<td style="border: 1px solid black;text-align: center;">{{ $item['sabt_gps'] ?? '-' }}</td> <td style="border: 1px solid black;text-align: center;">{{ $item['sabt_gps'] ?? '-' }}</td>

View File

@@ -5,7 +5,7 @@
<meta charset="UTF-8"> <meta charset="UTF-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge"> <meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1.0"> <meta name="viewport" content="width=device-width, initial-scale=1.0">
<title> گزارش ادارات شهرستان </title> <title>گزارش ادارات شهرستان </title>
<style> <style>
table, table,
@@ -27,18 +27,18 @@
<table> <table>
<thead> <thead>
<tr> <tr>
<th colspan="3" <th colspan="7"
style="background-color: #DAEEF3;text-align: center;border-right: 1px solid black;font-weight:bolder;"> style="background-color: #DAEEF3;text-align: center;border-right: 1px solid black;font-weight:bolder;">
تاریخ دریافت گزارش: {{ verta()->now()->format('Y/m/d H:i') }} تاریخ دریافت گزارش: {{ verta()->now()->format('Y/m/d H:i') }}
</th> </th>
</tr> </tr>
<tr> <tr>
<th colspan="3" <th colspan="7"
style="background-color: #DAEEF3;text-align: center;border-right:1px solid black;font-weight:bolder;"> style="background-color: #DAEEF3;text-align: center;border-right:1px solid black;font-weight:bolder;">
</th> </th>
</tr> </tr>
<tr> <tr>
<th colspan="3" <th colspan="7"
style="background-color: #DAEEF3;text-align: center;border-right:1px solid black;font-weight:bolder;font-size: 13px;"> style="background-color: #DAEEF3;text-align: center;border-right:1px solid black;font-weight:bolder;font-size: 13px;">
گزارش نخلف های صورت گرفته گزارش نخلف های صورت گرفته
</th> </th>
@@ -79,7 +79,7 @@
@foreach ($rows as $item) @foreach ($rows as $item)
<tr> <tr>
<td style="border: 1px solid black;text-align: center;">{{ $item['city_name'] ?? '-' }}</td> <td style="border: 1px solid black;text-align: center;">{{ $item['city_name'] ?? '-' }}</td>
<td style="border: 1px solid black;text-align: center;">{{ $item['total_violations'] ?? '-' }}</td> <td style="border: 1px solid black;text-align: center;">{{ $item['total'] ?? '-' }}</td>
<td style="border: 1px solid black;text-align: center;">{{ $item['egdam_shode'] ?? '-' }}</td> <td style="border: 1px solid black;text-align: center;">{{ $item['egdam_shode'] ?? '-' }}</td>
<td style="border: 1px solid black;text-align: center;">{{ $item['bedone_egdam'] ?? '-' }}</td> <td style="border: 1px solid black;text-align: center;">{{ $item['bedone_egdam'] ?? '-' }}</td>
<td style="border: 1px solid black;text-align: center;">{{ $item['sabt_gps'] ?? '-' }}</td> <td style="border: 1px solid black;text-align: center;">{{ $item['sabt_gps'] ?? '-' }}</td>

View File

@@ -5,7 +5,7 @@
<meta charset="UTF-8"> <meta charset="UTF-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge"> <meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1.0"> <meta name="viewport" content="width=device-width, initial-scale=1.0">
<title> گزارش کل کشور </title> <title>گزارش کل کشور </title>
<style> <style>
table, table,
@@ -27,20 +27,20 @@
<table> <table>
<thead> <thead>
<tr> <tr>
<th colspan="7" <th colspan="11"
style="background-color: #DAEEF3;text-align: center;border-right: 1px solid black;font-weight:bolder;"> style="background-color: #DAEEF3;text-align: center;border-right: 1px solid black;font-weight:bolder;">
تاریخ دریافت گزارش: {{ verta()->now()->format('Y/m/d H:i') }} تاریخ دریافت گزارش: {{ verta()->now()->format('Y/m/d H:i') }}
</th> </th>
</tr> </tr>
<tr> <tr>
<th colspan="7" <th colspan="11"
style="background-color: #DAEEF3;text-align: center;border-right:1px solid black;font-weight:bolder;"> style="background-color: #DAEEF3;text-align: center;border-right:1px solid black;font-weight:bolder;">
</th> </th>
</tr> </tr>
<tr> <tr>
<th colspan="7" <th colspan="11"
style="background-color: #DAEEF3;text-align: center;border-right:1px solid black;font-weight:bolder;font-size: 13px;"> style="background-color: #DAEEF3;text-align: center;border-right:1px solid black;font-weight:bolder;font-size: 13px;">
گزارش نخلف های صورت گرفته گزارش ماموریت های انجام شده
</th> </th>
</tr> </tr>
<tr> <tr>

View File

@@ -5,7 +5,7 @@
<meta charset="UTF-8"> <meta charset="UTF-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge"> <meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1.0"> <meta name="viewport" content="width=device-width, initial-scale=1.0">
<title> گزارش ادارات شهرستان </title> <title>گزارش ادارات شهرستان </title>
<style> <style>
table, table,
@@ -27,20 +27,20 @@
<table> <table>
<thead> <thead>
<tr> <tr>
<th colspan="7" <th colspan="11"
style="background-color: #DAEEF3;text-align: center;border-right: 1px solid black;font-weight:bolder;"> style="background-color: #DAEEF3;text-align: center;border-right: 1px solid black;font-weight:bolder;">
تاریخ دریافت گزارش: {{ verta()->now()->format('Y/m/d H:i') }} تاریخ دریافت گزارش: {{ verta()->now()->format('Y/m/d H:i') }}
</th> </th>
</tr> </tr>
<tr> <tr>
<th colspan="7" <th colspan="11"
style="background-color: #DAEEF3;text-align: center;border-right:1px solid black;font-weight:bolder;"> style="background-color: #DAEEF3;text-align: center;border-right:1px solid black;font-weight:bolder;">
</th> </th>
</tr> </tr>
<tr> <tr>
<th colspan="7" <th colspan="11"
style="background-color: #DAEEF3;text-align: center;border-right:1px solid black;font-weight:bolder;font-size: 13px;"> style="background-color: #DAEEF3;text-align: center;border-right:1px solid black;font-weight:bolder;font-size: 13px;">
گزارش نخلف های صورت گرفته گزارش ماموریت های انجام شده
</th> </th>
</tr> </tr>
<tr> <tr>

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')