From acdce4a3bd9229e0606625e81f9fd61c850a18d9 Mon Sep 17 00:00:00 2001 From: amirghasempoor Date: Mon, 26 Jan 2026 16:40:34 +0330 Subject: [PATCH 1/5] debug the reports --- .../Mission/Report/ReportTradodController.php | 8 +- .../Report/ReportViolationController.php | 8 +- app/Providers/AppServiceProvider.php | 2 +- app/Providers/RouteServiceProvider.php | 2 +- .../Mission/Report/ReportTradodService.php | 266 +++++++++--------- .../Mission/Report/ReportViolationService.php | 196 ++++++------- routes/v3.php | 20 +- 7 files changed, 259 insertions(+), 243 deletions(-) diff --git a/app/Http/Controllers/V3/Dashboard/Mission/Report/ReportTradodController.php b/app/Http/Controllers/V3/Dashboard/Mission/Report/ReportTradodController.php index d5610e3a..46508fef 100644 --- a/app/Http/Controllers/V3/Dashboard/Mission/Report/ReportTradodController.php +++ b/app/Http/Controllers/V3/Dashboard/Mission/Report/ReportTradodController.php @@ -31,7 +31,13 @@ class ReportTradodController extends Controller { return $this->successResponse([ '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']) ]); } diff --git a/app/Http/Controllers/V3/Dashboard/Mission/Report/ReportViolationController.php b/app/Http/Controllers/V3/Dashboard/Mission/Report/ReportViolationController.php index 9be4b05b..3cc97a10 100644 --- a/app/Http/Controllers/V3/Dashboard/Mission/Report/ReportViolationController.php +++ b/app/Http/Controllers/V3/Dashboard/Mission/Report/ReportViolationController.php @@ -31,7 +31,13 @@ class ReportViolationController extends Controller { return $this->successResponse([ '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']) ]); } diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php index fe8a66ae..a794382e 100644 --- a/app/Providers/AppServiceProvider.php +++ b/app/Providers/AppServiceProvider.php @@ -25,6 +25,6 @@ class AppServiceProvider extends ServiceProvider public function boot() { Schema::defaultStringLength(191); - \URL::forceScheme('https'); +// \URL::forceScheme('https'); } } diff --git a/app/Providers/RouteServiceProvider.php b/app/Providers/RouteServiceProvider.php index 1276b656..4d661d74 100644 --- a/app/Providers/RouteServiceProvider.php +++ b/app/Providers/RouteServiceProvider.php @@ -70,7 +70,7 @@ class RouteServiceProvider extends ServiceProvider Route::prefix('api/v3') ->name('v3.') - ->middleware(['web', 'auth', 'confirmUser']) +// ->middleware(['web', 'auth', 'confirmUser']) ->namespace($this->namespace) ->group(base_path('routes/v3.php')); diff --git a/app/Services/Cartables/Mission/Report/ReportTradodService.php b/app/Services/Cartables/Mission/Report/ReportTradodService.php index f975662d..f0d25df3 100644 --- a/app/Services/Cartables/Mission/Report/ReportTradodService.php +++ b/app/Services/Cartables/Mission/Report/ReportTradodService.php @@ -27,76 +27,77 @@ class ReportTradodService public function countryActivity(Request $request): array { $from = $request->from_date ?? today()->startOfDay(); - $to = 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; - - "; + $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_1 + AND m.created_at <= :to_m_1 + 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_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, [ - 'from_m' => $from, - 'to_m' => $to, + 'from_m_1' => $from, + 'to_m_1' => $to, + 'from_m_2' => $from, + 'to_m_2' => $to, ]); } @@ -104,57 +105,27 @@ class ReportTradodService { $provinceId = $request->province_id ?? auth()->user()->province_id; $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 city_name, - -1 AS city_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 - c.id AS city_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(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* + FROM( + SELECT + 'کل استان' AS city_name, + -1 AS city_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 c.id AS city_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, @@ -165,29 +136,58 @@ class ReportTradodService 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 + 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 m.created_at >= :from_m_1 + AND m.created_at <= :to_m_1 + WHERE c.province_id = :province_id_1 AND ( - c.type_id = 1 - OR c.name_fa IN ('اداره ماشين‌آلات', 'اداره نقلیه') + 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; - - "; + GROUP BY c.id + ) t + + UNION ALL + + SELECT + c.name_fa AS city_name, + c.id AS city_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(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_2 + AND m.created_at <= :to_m_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, [ - 'province_id' => $provinceId, - 'from_m' => $from, - 'to_m' => $to, + 'province_id_1' => $provinceId, + 'from_m_1' => $from, + 'to_m_1' => $to, + 'province_id_2' => $provinceId, + 'from_m_2' => $from, + 'to_m_2' => $to, ]); } } diff --git a/app/Services/Cartables/Mission/Report/ReportViolationService.php b/app/Services/Cartables/Mission/Report/ReportViolationService.php index 278868fa..5e9f2c91 100644 --- a/app/Services/Cartables/Mission/Report/ReportViolationService.php +++ b/app/Services/Cartables/Mission/Report/ReportViolationService.php @@ -27,20 +27,21 @@ class ReportViolationService public function countryActivity(Request $request): array { $from = $request->from_date ?? today()->startOfDay(); - $to = Carbon::parse($request->to_date)->endOfDay() ?? today()->endOfDay(); + // اصلاحیه برای جلوگیری از خطا در صورت null بودن to_date + $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.done) AS done, - SUM(t.undone) AS undone, - SUM(t.gps) AS gps, - SUM(t.herasat) AS herasat, - SUM(t.mil_gps) AS mil_gps + SELECT* + FROM( + SELECT + 'کل کشور' AS province_name, + -1 AS province_id, + SUM(t.total) AS total, + SUM(t.done) AS done, + SUM(t.undone) AS undone, + SUM(t.gps) AS gps, + SUM(t.herasat) AS herasat, + SUM(t.mil_gps) AS mil_gps FROM ( SELECT p.id AS province_id, @@ -50,44 +51,44 @@ class ReportViolationService 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_1 + AND mv.created_at <= :to_mv_1 + 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 - 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 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 + AND mv.created_at >= :from_mv_2 + AND mv.created_at <= :to_mv_2 + GROUP BY p.id, p.name_fa + ) q ORDER BY - CASE WHEN province_id = -1 THEN 0 ELSE 1 END, - province_name; - - "; + CASE WHEN province_id = -1 THEN 0 ELSE 1 END, + province_name; + "; return DB::select($sql, [ - 'from_mv' => $from, - 'to_mv' => $to, + 'from_mv_1' => $from, + 'to_mv_1' => $to, + 'from_mv_2' => $from, + 'to_mv_2' => $to, ]); } @@ -95,47 +96,23 @@ class ReportViolationService { $provinceId = $request->province_id ?? auth()->user()->province_id; $from = $request->from_date ?? today()->startOfDay(); - $to = Carbon::parse($request->to_date)->endOfDay() ?? today()->endOfDay(); + // اصلاحیه برای جلوگیری از خطا در صورت null بودن to_date + $to = $request->to_date ? Carbon::parse($request->to_date)->endOfDay() : today()->endOfDay(); $sql = " - SELECT* - FROM( + SELECT* + FROM( + SELECT + 'کل استان' AS city_name, + -1 AS city_id, + SUM(t.total) AS total, + SUM(t.done) AS done, + SUM(t.undone) AS undone, + SUM(t.gps) AS gps, + SUM(t.herasat) AS herasat, + SUM(t.mil_gps) AS mil_gps + FROM ( SELECT - 'کل استان' AS city_name, - -1 AS city_id, - SUM(t.total) AS total, - SUM(t.done) AS done, - SUM(t.undone) AS undone, - SUM(t.gps) AS gps, - SUM(t.herasat) AS herasat, - SUM(t.mil_gps) AS mil_gps - FROM ( - SELECT - 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 - ) t - - 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, @@ -147,25 +124,52 @@ class ReportViolationService 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 mv.created_at >= :from_mv_1 + AND mv.created_at <= :to_mv_1 + WHERE c.province_id = :province_id_1 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; - + c.type_id = 1 + OR c.name_fa IN ('اداره ماشين‌آلات', 'اداره نقلیه') + ) + GROUP BY c.id + ) t + + 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_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, [ - 'province_id' => $provinceId, - 'from_mv' => $from, - 'to_mv' => $to, + 'province_id_1' => $provinceId, + 'from_mv_1' => $from, + 'to_mv_1' => $to, + 'province_id_2' => $provinceId, + 'from_mv_2' => $from, + 'to_mv_2' => $to, ]); } } diff --git a/routes/v3.php b/routes/v3.php index ce0d74ad..6c10cec9 100644 --- a/routes/v3.php +++ b/routes/v3.php @@ -539,21 +539,21 @@ Route::prefix('missions') ->name('reportsViolation.') ->controller(ReportViolationController::class) ->group(function () { - Route::get('/country_activity', 'countryActivity')->name('countryActivity') - ->middleware('permission:mission-report-country'); - Route::get('/province_activity', 'provinceActivity')->name('provinceActivity') - ->middleware('permission:mission-report-province'); + Route::get('/country_activity', 'countryActivity')->name('countryActivity'); +// ->middleware('permission:mission-report-country'); + Route::get('/province_activity', 'provinceActivity')->name('provinceActivity'); +// ->middleware('permission:mission-report-province'); Route::get('/country_excel_activity', 'countryExcelActivity')->name('countryExcelActivity'); Route::get('/province_excel_activity', 'provinceExcelActivity')->name('provinceExcelActivity'); }); - Route::prefix('report_tradod') - ->name('reportsTradod.') + Route::prefix('report_taradod') + ->name('reportsTaradod.') ->controller(ReportTradodController::class) ->group(function () { - Route::get('/country_activity', 'countryActivity')->name('countryActivity') - ->middleware('permission:mission-report-country'); - Route::get('/province_activity', 'provinceActivity')->name('provinceActivity') - ->middleware('permission:mission-report-province'); + Route::get('/country_activity', 'countryActivity')->name('countryActivity'); +// ->middleware('permission:mission-report-country'); + Route::get('/province_activity', 'provinceActivity')->name('provinceActivity'); +// ->middleware('permission:mission-report-province'); Route::get('/country_excel_activity', 'countryExcelActivity')->name('countryExcelActivity'); Route::get('/province_excel_activity', 'provinceExcelActivity')->name('provinceExcelActivity'); }); From 81bd7532e9b201938b7817578c2ef72e487e2120 Mon Sep 17 00:00:00 2001 From: faezehzafarbakhsh Date: Tue, 27 Jan 2026 10:26:47 +0330 Subject: [PATCH 2/5] fix code in views --- app/Exports/V3/Mission/Report/Violation/CountryReport.php | 2 +- app/Exports/V3/Mission/Report/Violation/ProvinceReport.php | 2 +- .../V3/Dashboard/Mission/Report/ReportTradodController.php | 4 ++-- .../Reports/Mission/Report/CountryActivityReport.blade.php | 6 +++--- .../Reports/Mission/Report/ProvinceActivityReport.blade.php | 6 +++--- .../Mission/Report/Tradod /CountryActivityReport.blade.php | 6 +++--- .../Mission/Report/Tradod /ProvinceActivityReport.blade.php | 6 +++--- 7 files changed, 16 insertions(+), 16 deletions(-) diff --git a/app/Exports/V3/Mission/Report/Violation/CountryReport.php b/app/Exports/V3/Mission/Report/Violation/CountryReport.php index 59eb65c7..7862ec52 100644 --- a/app/Exports/V3/Mission/Report/Violation/CountryReport.php +++ b/app/Exports/V3/Mission/Report/Violation/CountryReport.php @@ -94,7 +94,7 @@ class CountryReport implements FromView, ShouldAutoSize, WithDrawings, WithEvent $drawing2->setHeight(50); $drawing2->setOffsetX(5); $drawing2->setOffsetY(5); - $drawing2->setCoordinates('E1'); + $drawing2->setCoordinates('G1'); return [$drawing, $drawing2]; } diff --git a/app/Exports/V3/Mission/Report/Violation/ProvinceReport.php b/app/Exports/V3/Mission/Report/Violation/ProvinceReport.php index a4251c64..17adae78 100644 --- a/app/Exports/V3/Mission/Report/Violation/ProvinceReport.php +++ b/app/Exports/V3/Mission/Report/Violation/ProvinceReport.php @@ -98,7 +98,7 @@ class ProvinceReport implements FromView, ShouldAutoSize, WithDrawings, WithEven $drawing2->setHeight(50); $drawing2->setOffsetX(5); $drawing2->setOffsetY(5); - $drawing2->setCoordinates('E1'); + $drawing2->setCoordinates('G1'); return [$drawing, $drawing2]; } diff --git a/app/Http/Controllers/V3/Dashboard/Mission/Report/ReportTradodController.php b/app/Http/Controllers/V3/Dashboard/Mission/Report/ReportTradodController.php index d5610e3a..9bffa8bf 100644 --- a/app/Http/Controllers/V3/Dashboard/Mission/Report/ReportTradodController.php +++ b/app/Http/Controllers/V3/Dashboard/Mission/Report/ReportTradodController.php @@ -2,8 +2,8 @@ namespace App\Http\Controllers\V3\Dashboard\Mission\Report; -use App\Exports\V3\Mission\Report\Violation\CountryReport; -use App\Exports\V3\Mission\Report\Violation\ProvinceReport; +use App\Exports\V3\Mission\Report\Tradod\CountryReport; +use App\Exports\V3\Mission\Report\Tradod\ProvinceReport; use App\Http\Controllers\Controller; use App\Http\Traits\ApiResponse; use App\Models\City; diff --git a/resources/views/v3/Reports/Mission/Report/CountryActivityReport.blade.php b/resources/views/v3/Reports/Mission/Report/CountryActivityReport.blade.php index 2dbe9f08..a70cc052 100644 --- a/resources/views/v3/Reports/Mission/Report/CountryActivityReport.blade.php +++ b/resources/views/v3/Reports/Mission/Report/CountryActivityReport.blade.php @@ -27,18 +27,18 @@ - - - diff --git a/resources/views/v3/Reports/Mission/Report/ProvinceActivityReport.blade.php b/resources/views/v3/Reports/Mission/Report/ProvinceActivityReport.blade.php index d62f37ed..7d34bdc3 100644 --- a/resources/views/v3/Reports/Mission/Report/ProvinceActivityReport.blade.php +++ b/resources/views/v3/Reports/Mission/Report/ProvinceActivityReport.blade.php @@ -27,18 +27,18 @@
تاریخ دریافت گزارش: {{ verta()->now()->format('Y/m/d H:i') }}
گزارش نخلف های صورت گرفته
- - - diff --git a/resources/views/v3/Reports/Mission/Report/Tradod /CountryActivityReport.blade.php b/resources/views/v3/Reports/Mission/Report/Tradod /CountryActivityReport.blade.php index cfb60ac5..868274c1 100644 --- a/resources/views/v3/Reports/Mission/Report/Tradod /CountryActivityReport.blade.php +++ b/resources/views/v3/Reports/Mission/Report/Tradod /CountryActivityReport.blade.php @@ -27,18 +27,18 @@
تاریخ دریافت گزارش: {{ verta()->now()->format('Y/m/d H:i') }}
گزارش نخلف های صورت گرفته
- - - diff --git a/resources/views/v3/Reports/Mission/Report/Tradod /ProvinceActivityReport.blade.php b/resources/views/v3/Reports/Mission/Report/Tradod /ProvinceActivityReport.blade.php index a78d5b56..33b8c044 100644 --- a/resources/views/v3/Reports/Mission/Report/Tradod /ProvinceActivityReport.blade.php +++ b/resources/views/v3/Reports/Mission/Report/Tradod /ProvinceActivityReport.blade.php @@ -27,18 +27,18 @@
تاریخ دریافت گزارش: {{ verta()->now()->format('Y/m/d H:i') }}
گزارش نخلف های صورت گرفته
- - - From 93baa95f4612128e068becdb0a28a55bb1e93d55 Mon Sep 17 00:00:00 2001 From: amirghasempoor Date: Tue, 27 Jan 2026 11:21:34 +0330 Subject: [PATCH 3/5] fix the performance --- .../Mission/Report/ReportTradodService.php | 92 ++++++------------- .../Mission/Report/ReportViolationService.php | 75 +++++---------- 2 files changed, 48 insertions(+), 119 deletions(-) diff --git a/app/Services/Cartables/Mission/Report/ReportTradodService.php b/app/Services/Cartables/Mission/Report/ReportTradodService.php index f0d25df3..2aacae97 100644 --- a/app/Services/Cartables/Mission/Report/ReportTradodService.php +++ b/app/Services/Cartables/Mission/Report/ReportTradodService.php @@ -35,36 +35,19 @@ class ReportTradodService 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_1 - AND m.created_at <= :to_m_1 - GROUP BY p.id - ) t + 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 @@ -113,41 +96,20 @@ class ReportTradodService SELECT 'کل استان' AS city_name, -1 AS city_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 - c.id AS city_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(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_1 - AND m.created_at <= :to_m_1 - WHERE c.province_id = :province_id_1 - AND ( - c.type_id = 1 - OR c.name_fa IN ('اداره ماشين‌آلات', 'اداره نقلیه') - ) - GROUP BY c.id - ) t + 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(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 missions m + WHERE m.created_at >= :from_m_1 + AND m.created_at <= :to_m_1 + AND m.province_id = :province_id_1 UNION ALL diff --git a/app/Services/Cartables/Mission/Report/ReportViolationService.php b/app/Services/Cartables/Mission/Report/ReportViolationService.php index 5e9f2c91..45ec40a1 100644 --- a/app/Services/Cartables/Mission/Report/ReportViolationService.php +++ b/app/Services/Cartables/Mission/Report/ReportViolationService.php @@ -27,7 +27,6 @@ class ReportViolationService public function countryActivity(Request $request): array { $from = $request->from_date ?? today()->startOfDay(); - // اصلاحیه برای جلوگیری از خطا در صورت null بودن to_date $to = $request->to_date ? Carbon::parse($request->to_date)->endOfDay() : today()->endOfDay(); $sql = " @@ -36,29 +35,15 @@ class ReportViolationService SELECT 'کل کشور' AS province_name, -1 AS province_id, - SUM(t.total) AS total, - SUM(t.done) AS done, - SUM(t.undone) AS undone, - SUM(t.gps) AS gps, - SUM(t.herasat) AS herasat, - SUM(t.mil_gps) AS mil_gps - FROM ( - SELECT - 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_1 - AND mv.created_at <= :to_mv_1 - GROUP BY p.id - ) t + 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 mission_violations mv + WHERE mv.created_at >= :from_mv_1 + AND mv.created_at <= :to_mv_1 UNION ALL @@ -96,7 +81,6 @@ class ReportViolationService { $provinceId = $request->province_id ?? auth()->user()->province_id; $from = $request->from_date ?? today()->startOfDay(); - // اصلاحیه برای جلوگیری از خطا در صورت null بودن to_date $to = $request->to_date ? Carbon::parse($request->to_date)->endOfDay() : today()->endOfDay(); $sql = " @@ -105,34 +89,17 @@ class ReportViolationService SELECT 'کل استان' AS city_name, -1 AS city_id, - SUM(t.total) AS total, - SUM(t.done) AS done, - SUM(t.undone) AS undone, - SUM(t.gps) AS gps, - SUM(t.herasat) AS herasat, - SUM(t.mil_gps) AS mil_gps - FROM ( - SELECT - 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_1 - AND mv.created_at <= :to_mv_1 - WHERE c.province_id = :province_id_1 - AND ( - c.type_id = 1 - OR c.name_fa IN ('اداره ماشين‌آلات', 'اداره نقلیه') - ) - GROUP BY c.id - ) t + 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 mission_violations mv + WHERE mv.type = 1 + AND mv.created_at >= :from_mv_1 + AND mv.created_at <= :to_mv_1 + AND mv.province_id = :province_id_1 UNION ALL @@ -147,7 +114,7 @@ class ReportViolationService 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 + ON mv.city_id = c.id AND mv.type = 1 AND mv.created_at >= :from_mv_2 AND mv.created_at <= :to_mv_2 From ad03609c3d92b93d10ea5c458d83bff35744696b Mon Sep 17 00:00:00 2001 From: amirghasempoor Date: Tue, 27 Jan 2026 11:32:08 +0330 Subject: [PATCH 4/5] revert the dependencies --- app/Providers/AppServiceProvider.php | 2 +- app/Providers/RouteServiceProvider.php | 2 +- routes/v3.php | 16 ++++++++-------- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php index a794382e..fe8a66ae 100644 --- a/app/Providers/AppServiceProvider.php +++ b/app/Providers/AppServiceProvider.php @@ -25,6 +25,6 @@ class AppServiceProvider extends ServiceProvider public function boot() { Schema::defaultStringLength(191); -// \URL::forceScheme('https'); + \URL::forceScheme('https'); } } diff --git a/app/Providers/RouteServiceProvider.php b/app/Providers/RouteServiceProvider.php index 4d661d74..1276b656 100644 --- a/app/Providers/RouteServiceProvider.php +++ b/app/Providers/RouteServiceProvider.php @@ -70,7 +70,7 @@ class RouteServiceProvider extends ServiceProvider Route::prefix('api/v3') ->name('v3.') -// ->middleware(['web', 'auth', 'confirmUser']) + ->middleware(['web', 'auth', 'confirmUser']) ->namespace($this->namespace) ->group(base_path('routes/v3.php')); diff --git a/routes/v3.php b/routes/v3.php index 6c10cec9..679c96b3 100644 --- a/routes/v3.php +++ b/routes/v3.php @@ -539,10 +539,10 @@ Route::prefix('missions') ->name('reportsViolation.') ->controller(ReportViolationController::class) ->group(function () { - Route::get('/country_activity', 'countryActivity')->name('countryActivity'); -// ->middleware('permission:mission-report-country'); - Route::get('/province_activity', 'provinceActivity')->name('provinceActivity'); -// ->middleware('permission:mission-report-province'); + Route::get('/country_activity', 'countryActivity')->name('countryActivity') + ->middleware('permission:mission-report-country'); + Route::get('/province_activity', 'provinceActivity')->name('provinceActivity') + ->middleware('permission:mission-report-province'); Route::get('/country_excel_activity', 'countryExcelActivity')->name('countryExcelActivity'); Route::get('/province_excel_activity', 'provinceExcelActivity')->name('provinceExcelActivity'); }); @@ -550,10 +550,10 @@ Route::prefix('missions') ->name('reportsTaradod.') ->controller(ReportTradodController::class) ->group(function () { - Route::get('/country_activity', 'countryActivity')->name('countryActivity'); -// ->middleware('permission:mission-report-country'); - Route::get('/province_activity', 'provinceActivity')->name('provinceActivity'); -// ->middleware('permission:mission-report-province'); + Route::get('/country_activity', 'countryActivity')->name('countryActivity') + ->middleware('permission:mission-report-country'); + Route::get('/province_activity', 'provinceActivity')->name('provinceActivity') + ->middleware('permission:mission-report-province'); Route::get('/country_excel_activity', 'countryExcelActivity')->name('countryExcelActivity'); Route::get('/province_excel_activity', 'provinceExcelActivity')->name('provinceExcelActivity'); }); From f1c560928e3f06abe3daf005cdc5b730c80f8e30 Mon Sep 17 00:00:00 2001 From: amirghasempoor Date: Tue, 27 Jan 2026 11:54:14 +0330 Subject: [PATCH 5/5] debug the excels --- app/Exports/V3/Mission/Report/Tradod/CountryReport.php | 2 +- app/Exports/V3/Mission/Report/Tradod/ProvinceReport.php | 2 +- app/Exports/V3/Mission/Report/Violation/CountryReport.php | 2 +- app/Exports/V3/Mission/Report/Violation/ProvinceReport.php | 2 +- .../v3/Reports/Mission/Report/CountryActivityReport.blade.php | 4 ++-- .../Reports/Mission/Report/ProvinceActivityReport.blade.php | 4 ++-- .../Mission/Report/Tradod /CountryActivityReport.blade.php | 4 ++-- .../Mission/Report/Tradod /ProvinceActivityReport.blade.php | 4 ++-- 8 files changed, 12 insertions(+), 12 deletions(-) diff --git a/app/Exports/V3/Mission/Report/Tradod/CountryReport.php b/app/Exports/V3/Mission/Report/Tradod/CountryReport.php index 425879b5..69e2b66d 100644 --- a/app/Exports/V3/Mission/Report/Tradod/CountryReport.php +++ b/app/Exports/V3/Mission/Report/Tradod/CountryReport.php @@ -69,7 +69,7 @@ class CountryReport implements FromView, ShouldAutoSize, WithDrawings, WithEvent $exportRows[] = $row; } - return view('v3.Reports.Mission.Report.CountryActivityReport', [ + return view('v3.Reports.Mission.Report.Tradod .CountryActivityReport', [ 'rows' => $exportRows, ]); } diff --git a/app/Exports/V3/Mission/Report/Tradod/ProvinceReport.php b/app/Exports/V3/Mission/Report/Tradod/ProvinceReport.php index e56d6cef..28e31bd0 100644 --- a/app/Exports/V3/Mission/Report/Tradod/ProvinceReport.php +++ b/app/Exports/V3/Mission/Report/Tradod/ProvinceReport.php @@ -71,7 +71,7 @@ class ProvinceReport implements FromView, ShouldAutoSize, WithDrawings, WithEven $exportRows[] = $row; } - return view('v3.Reports.Mission.Report.ProvinceActivityReport', [ + return view('v3.Reports.Mission.Report.Tradod .ProvinceActivityReport', [ 'rows' => $exportRows, ]); } diff --git a/app/Exports/V3/Mission/Report/Violation/CountryReport.php b/app/Exports/V3/Mission/Report/Violation/CountryReport.php index 7862ec52..b38b65a4 100644 --- a/app/Exports/V3/Mission/Report/Violation/CountryReport.php +++ b/app/Exports/V3/Mission/Report/Violation/CountryReport.php @@ -30,7 +30,7 @@ class CountryReport implements FromView, ShouldAutoSize, WithDrawings, WithEvent 'province_name' => $name, 'total' => (int) ($r->total ?? 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_herasat' => (int) ($r->herasat ?? 0), 'mil_gps' => (int) ($r->mil_gps ?? 0), diff --git a/app/Exports/V3/Mission/Report/Violation/ProvinceReport.php b/app/Exports/V3/Mission/Report/Violation/ProvinceReport.php index 17adae78..29a52806 100644 --- a/app/Exports/V3/Mission/Report/Violation/ProvinceReport.php +++ b/app/Exports/V3/Mission/Report/Violation/ProvinceReport.php @@ -31,7 +31,7 @@ class ProvinceReport implements FromView, ShouldAutoSize, WithDrawings, WithEven 'city_name' => $name, 'total' => (int) ($r->total ?? 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_herasat' => (int) ($r->herasat ?? 0), 'mil_gps' => (int) ($r->mil_gps ?? 0), diff --git a/resources/views/v3/Reports/Mission/Report/CountryActivityReport.blade.php b/resources/views/v3/Reports/Mission/Report/CountryActivityReport.blade.php index a70cc052..2f929a97 100644 --- a/resources/views/v3/Reports/Mission/Report/CountryActivityReport.blade.php +++ b/resources/views/v3/Reports/Mission/Report/CountryActivityReport.blade.php @@ -5,7 +5,7 @@ - گزارش کل کشور + گزارش کل کشور
تاریخ دریافت گزارش: {{ verta()->now()->format('Y/m/d H:i') }}
گزارش نخلف های صورت گرفته