From acdce4a3bd9229e0606625e81f9fd61c850a18d9 Mon Sep 17 00:00:00 2001
From: amirghasempoor <amirghasempoor79@gmail.com>
Date: Mon, 26 Jan 2026 16:40:34 +0330
Subject: [PATCH] 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');
             });