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

refactor the queries

Browse Source
This commit is contained in:
amirghasempoor
2025-02-09 09:30:49 +03:30
parent 18cbf77261
commit c8ff302d09
3 changed files with 19 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
app/Http/Controllers/V3/Dashboard/Reports/RoadItemsReportController.php
View File

@@ -152,18 +152,19 @@ class RoadItemsReportController extends Controller
$cityId = $request->city_id; $cityId = $request->city_id;
$subId = $request->sub_id; $subId = $request->sub_id;
$item = $request->item; $item = $request->item;
$status = $request->status;
$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();
$data = RoadItemsProject::query() $data = RoadItemsProject::query()
->where('is_new', '=', 1) ->where('is_new', '=', 1)
->when($provinceId, fn($query) => $query->where('province_id', '=', $provinceId)) ->when($provinceId, fn($query, $provinceId) => $query->where('road_items_projects.province_id', '=', $provinceId))
->when($cityId, fn($query) => $query->where('city_id', '=', $cityId)) ->when($cityId, fn($query, $cityId) => $query->where('road_items_projects.city_id', '=', $cityId))
->when($subId, fn($query) => $query->where('sub_items', 'like', '%' . $subId . '%')) ->when($subId, fn($query, $subId) => $query->where('sub_items', 'like', '%' . $subId . '%'))
->when($item, fn($query) => $query->where('item', '=', $item)) ->when($item, fn($query, $item) => $query->where('item', '=', $item))
->when(!is_null($request->status), fn($query) => $query->where('status', '=', $request->status)) ->when(!is_null($status), fn($query, $status) => $query->where('status', '=', $status))
->whereBetween('activity_date', [$dateFrom, $dateTo])
->leftJoin('users', 'users.id', '=', 'road_items_projects.user_id') ->leftJoin('users', 'users.id', '=', 'road_items_projects.user_id')
->whereBetween('road_items_projects.activity_date', [$dateFrom, $dateTo])
->select('road_items_projects.id as i', 'start_lat as l', 'start_lng as g', 'status') ->select('road_items_projects.id as i', 'start_lat as l', 'start_lng as g', 'status')
->get(); ->get();

24
app/Http/Controllers/V3/Dashboard/Reports/RoadPatrolReportController.php
View File

@@ -71,27 +71,23 @@ class RoadPatrolReportController extends Controller
public function activitiesOnMap(Request $request): JsonResponse public function activitiesOnMap(Request $request): JsonResponse
{ {
$date_from = $request->date_from ? $request->date_from .' 00:00:00' : Date('Y-m-d') .' 00:00:00'; $date_from = $request->date_from ? $request->date_from .' 00:00:00' : now()->startOfDay()->toDateTimeString();
$date_to = $request->date_to ? $request->date_to.' 23:59:59' : (new \DateTime('tomorrow'))->format('Y-m-d').' 23:59:59'; $date_to = $request->date_to ? $request->date_to.' 23:59:59' : now()->addDay()->startOfDay()->toDateTimeString();
$provinceId = $request->province_id;
$edareId = $request->edare_id;
$data = RoadPatrol::query()->when($request->province_id, function ($query, $province) { $data = RoadPatrol::query()
return $query->where('province_id', '=', $province); ->when($provinceId, fn($query, $provinceId) => $query->where('province_id', '=', $provinceId))
}) ->when($edareId, fn($query, $edareId) => $query->where('edare_id', '=', $edareId))
->when($request->edare_id, function ($query, $edare_id) { ->whereBetween('created_at', [$date_from, $date_to])
return $query->where('edare_id', '=', $edare_id);
})
->whereBetween('created_at', [
$date_from,
$date_to,
])
->select('id', 'start_lat', 'start_lon') ->select('id', 'start_lat', 'start_lon')
->get(); ->get();
return $this->successResponse($data); return $this->successResponse($data);
} }
public function showOnMap(RoadPatrol $road_patrol) public function showOnMap(RoadPatrol $roadPatrol): JsonResponse
{ {
return $this->successResponse($road_patrol->load(['rahdaran:id,name,code', 'cmmsMachines:id,machine_code,car_name,plak_number'])); return $this->successResponse($roadPatrol->load(['rahdaran:id,name,code', 'cmmsMachines:id,machine_code,car_name,plak_number']));
} }
} }

3
routes/v3.php
View File

@@ -201,7 +201,7 @@ Route::prefix('road_item_reports')
Route::get('/country_activity_excel_per_sub_item', 'countryActivityExcelPerSubItem')->name('countryActivityExcelPerSubItem'); Route::get('/country_activity_excel_per_sub_item', 'countryActivityExcelPerSubItem')->name('countryActivityExcelPerSubItem');
Route::get('/province_activity_excel_per_sub_item', 'provinceActivityExcelPerSubItem')->name('provinceActivityExcelPerSubItem'); Route::get('/province_activity_excel_per_sub_item', 'provinceActivityExcelPerSubItem')->name('provinceActivityExcelPerSubItem');
Route::get('/activities_on_map', 'activitiesOnMap')->name('activitiesOnMap'); Route::get('/activities_on_map', 'activitiesOnMap')->name('activitiesOnMap');
Route::get('/show_on_map', 'showOnMap')->name('showOnMap'); Route::get('/show_on_map/{roadItemsProject}', 'showOnMap')->name('showOnMap');
}); });
Route::prefix('road_patrol_reports') Route::prefix('road_patrol_reports')
@@ -213,4 +213,5 @@ Route::prefix('road_patrol_reports')
Route::get('/country_activity_excel', 'countryActivityExcel')->name('countryActivityExcel'); Route::get('/country_activity_excel', 'countryActivityExcel')->name('countryActivityExcel');
Route::get('/province_activity_excel', 'provinceActivityExcel')->name('provinceActivityExcel'); Route::get('/province_activity_excel', 'provinceActivityExcel')->name('provinceActivityExcel');
Route::get('/activities_on_map', 'activitiesOnMap')->name('activitiesOnMap'); Route::get('/activities_on_map', 'activitiesOnMap')->name('activitiesOnMap');
Route::get('/show_on_map/{roadPatrol}', 'showOnMap')->name('showOnMap');
}); });