diff --git a/app/Http/Controllers/V3/Reports/RoadItemsReportController.php b/app/Http/Controllers/V3/Reports/RoadItemsReportController.php index 777dd568..8a18b684 100644 --- a/app/Http/Controllers/V3/Reports/RoadItemsReportController.php +++ b/app/Http/Controllers/V3/Reports/RoadItemsReportController.php @@ -102,7 +102,7 @@ class RoadItemsReportController extends Controller ]); } - public function provinceExcel(Request $request): JsonResponse + public function activityStatisticsPerProvince(Request $request): JsonResponse { if (auth()->check()) { auth()->user()->addActivityComplete(1033); @@ -124,14 +124,6 @@ class RoadItemsReportController extends Controller }) ->groupBy('province_id', 'item'); - $roadPatrolsQuery = RoadPatrol::query() - ->selectRaw('COUNT(*) AS s, province_id AS p, 77 AS i') - ->whereBetween('start_time', [$fromDate, $toDate]) - ->when(!$isSpecialUser, function ($query) use ($provinceId) { - $query->where('province_id', $provinceId); - }) - ->groupBy('province_id'); - $roadItemsProjectsSummaryQuery = RoadItemsProject::query() ->selectRaw('COUNT(*) AS s, -1 AS p, item AS i') ->where('status', 1) @@ -141,24 +133,14 @@ class RoadItemsReportController extends Controller }) ->groupBy('item'); - $roadPatrolsSummaryQuery = RoadPatrol::query() - ->selectRaw('COUNT(*) AS s, -1 AS p, 77 AS i') - ->whereBetween('start_time', [$fromDate, $toDate]) - ->when(!$isSpecialUser, function ($query) use ($provinceId) { - $query->where('province_id', $provinceId); - }); - - // Combine queries using UNION ALL $data = $roadItemsProjectsQuery - ->unionAll($roadPatrolsQuery) ->unionAll($roadItemsProjectsSummaryQuery) - ->unionAll($roadPatrolsSummaryQuery) ->get(); return $this->successResponse($data); } - public function cityExcel(Request $request): JsonResponse + public function activityStatisticsPerCity(Request $request): JsonResponse { $provinceId = $request->province_id; $fromDate = $request->from_date ? $request->from_date . ' 00:00:00' : now()->startOfDay()->toDateTimeString(); @@ -174,17 +156,18 @@ class RoadItemsReportController extends Controller ->where('province_id', $provinceId) ->groupBy('item', 'edarat_id'); - $roadPatrolsQuery = RoadPatrol::query() + $roadItemsProjectsSummaryQuery = RoadItemsProject::query() ->selectRaw(' COUNT(*) AS s, - edare_id AS c, - 77 AS i') - ->whereBetween('start_time', [$fromDate, $toDate]) - ->where('province_id', '=', $provinceId) - ->groupBy('edare_id'); + -1 AS c, + item AS i') + ->where('status', '=', 1) + ->whereBetween('activity_date_time', [$fromDate, $toDate]) + ->where('province_id', $provinceId) + ->groupBy('item'); $data = $roadItemsProjectsQuery - ->unionAll($roadPatrolsQuery) + ->unionAll($roadItemsProjectsSummaryQuery) ->get(); return $this->successResponse($data); @@ -195,6 +178,7 @@ class RoadItemsReportController extends Controller $provinceId = $request->province_id; $cityId = $request->city_id; $subId = $request->sub_id; + $item = $request->item; $dateFrom = $request->date_from ? $request->date_from . ' 00:00:00' : now()->startOfDay()->toDateTimeString(); $dateTo = $request->date_to ? $request->date_to . ' 23:59:59' : now()->addDay()->startOfDay()->toDateTimeString(); @@ -203,7 +187,7 @@ class RoadItemsReportController extends Controller ->when($provinceId, fn($query) => $query->where('province_id', '=', $provinceId)) ->when($cityId, fn($query) => $query->where('city_id', '=', $cityId)) ->when($subId, fn($query) => $query->where('sub_items', 'like', '%' . $subId . '%')) - ->when($request->item, fn($query) => $query->where('item', '=', $request->item)) + ->when($item, fn($query) => $query->where('item', '=', $item)) ->when(!is_null($request->status), fn($query) => $query->where('status', '=', $request->status)) ->whereBetween('activity_date', [$dateFrom, $dateTo]) ->leftJoin('users', 'users.id', '=', 'road_items_projects.user_id') diff --git a/routes/v3.php b/routes/v3.php index 08ea3979..079d83c2 100644 --- a/routes/v3.php +++ b/routes/v3.php @@ -197,8 +197,8 @@ Route::prefix('road_item_reports') Route::get('/get_sub_items', 'getSubItems')->name('getSubItems'); Route::get('/get_items', 'getItems')->name('getItems'); Route::get('/get_items_city', 'getItemsCity')->name('getItemsCity'); - Route::get('/province_excel', 'provinceExcel')->name('provinceExcel'); - Route::get('/city_excel', 'cityExcel')->name('cityExcel'); + Route::get('/province_statistics', 'activityStatisticsPerProvince')->name('activityStatisticsPerProvince'); + Route::get('/city_statistics', 'activityStatisticsPerCity')->name('activityStatisticsPerCity'); Route::get('/map', 'map')->name('map'); });