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

remove road patrol summary

Browse Source
This commit is contained in:
amirghasempoor
2025-01-07 16:06:22 +03:30
parent 90914793ff
commit 53dd73103b
2 changed files with 14 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
app/Http/Controllers/V3/Reports/RoadItemsReportController.php
View File

@@ -102,7 +102,7 @@ class RoadItemsReportController extends Controller
]); ]);
} }
public function provinceExcel(Request $request): JsonResponse public function activityStatisticsPerProvince(Request $request): JsonResponse
{ {
if (auth()->check()) { if (auth()->check()) {
auth()->user()->addActivityComplete(1033); auth()->user()->addActivityComplete(1033);
@@ -124,14 +124,6 @@ class RoadItemsReportController extends Controller
}) })
->groupBy('province_id', 'item'); ->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() $roadItemsProjectsSummaryQuery = RoadItemsProject::query()
->selectRaw('COUNT(*) AS s, -1 AS p, item AS i') ->selectRaw('COUNT(*) AS s, -1 AS p, item AS i')
->where('status', 1) ->where('status', 1)
@@ -141,24 +133,14 @@ class RoadItemsReportController extends Controller
}) })
->groupBy('item'); ->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 $data = $roadItemsProjectsQuery
->unionAll($roadPatrolsQuery)
->unionAll($roadItemsProjectsSummaryQuery) ->unionAll($roadItemsProjectsSummaryQuery)
->unionAll($roadPatrolsSummaryQuery)
->get(); ->get();
return $this->successResponse($data); return $this->successResponse($data);
} }
public function cityExcel(Request $request): JsonResponse public function activityStatisticsPerCity(Request $request): JsonResponse
{ {
$provinceId = $request->province_id; $provinceId = $request->province_id;
$fromDate = $request->from_date ? $request->from_date . ' 00:00:00' : now()->startOfDay()->toDateTimeString(); $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) ->where('province_id', $provinceId)
->groupBy('item', 'edarat_id'); ->groupBy('item', 'edarat_id');
$roadPatrolsQuery = RoadPatrol::query() $roadItemsProjectsSummaryQuery = RoadItemsProject::query()
->selectRaw(' ->selectRaw('
COUNT(*) AS s, COUNT(*) AS s,
edare_id AS c, -1 AS c,
77 AS i') item AS i')
->whereBetween('start_time', [$fromDate, $toDate]) ->where('status', '=', 1)
->where('province_id', '=', $provinceId) ->whereBetween('activity_date_time', [$fromDate, $toDate])
->groupBy('edare_id'); ->where('province_id', $provinceId)
->groupBy('item');
$data = $roadItemsProjectsQuery $data = $roadItemsProjectsQuery
->unionAll($roadPatrolsQuery) ->unionAll($roadItemsProjectsSummaryQuery)
->get(); ->get();
return $this->successResponse($data); return $this->successResponse($data);
@@ -195,6 +178,7 @@ class RoadItemsReportController extends Controller
$provinceId = $request->province_id; $provinceId = $request->province_id;
$cityId = $request->city_id; $cityId = $request->city_id;
$subId = $request->sub_id; $subId = $request->sub_id;
$item = $request->item;
$dateFrom = $request->date_from ? $request->date_from . ' 00:00:00' : now()->startOfDay()->toDateTimeString(); $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(); $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($provinceId, fn($query) => $query->where('province_id', '=', $provinceId))
->when($cityId, fn($query) => $query->where('city_id', '=', $cityId)) ->when($cityId, fn($query) => $query->where('city_id', '=', $cityId))
->when($subId, fn($query) => $query->where('sub_items', 'like', '%' . $subId . '%')) ->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)) ->when(!is_null($request->status), fn($query) => $query->where('status', '=', $request->status))
->whereBetween('activity_date', [$dateFrom, $dateTo]) ->whereBetween('activity_date', [$dateFrom, $dateTo])
->leftJoin('users', 'users.id', '=', 'road_items_projects.user_id') ->leftJoin('users', 'users.id', '=', 'road_items_projects.user_id')

4
routes/v3.php
View File

@@ -197,8 +197,8 @@ Route::prefix('road_item_reports')
Route::get('/get_sub_items', 'getSubItems')->name('getSubItems'); Route::get('/get_sub_items', 'getSubItems')->name('getSubItems');
Route::get('/get_items', 'getItems')->name('getItems'); Route::get('/get_items', 'getItems')->name('getItems');
Route::get('/get_items_city', 'getItemsCity')->name('getItemsCity'); Route::get('/get_items_city', 'getItemsCity')->name('getItemsCity');
Route::get('/province_excel', 'provinceExcel')->name('provinceExcel'); Route::get('/province_statistics', 'activityStatisticsPerProvince')->name('activityStatisticsPerProvince');
Route::get('/city_excel', 'cityExcel')->name('cityExcel'); Route::get('/city_statistics', 'activityStatisticsPerCity')->name('activityStatisticsPerCity');
Route::get('/map', 'map')->name('map'); Route::get('/map', 'map')->name('map');
}); });