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

Merge pull request #41 from witelgroup/feature/ReportRoadObservation

Browse Source 
debug and fix
This commit is contained in:
Amir Ghasempoor
2025-09-22 10:52:43 +03:30
committed by GitHub
parent 6a4696a41c 918ba2716c
commit f989270246
2 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/Http/Controllers/V3/Dashboard/RoadObservation/ReportController.php
View File

@@ -8,6 +8,7 @@ use App\Exports\V3\RoadObservation\ProvinceCartableReport;
use App\Facades\DataTable\DataTableFacade; use App\Facades\DataTable\DataTableFacade;
use App\Http\Traits\ApiResponse; use App\Http\Traits\ApiResponse;
use App\Models\EdarateShahri; use App\Models\EdarateShahri;
use App\Models\Province;
use App\Models\RoadObserved; use App\Models\RoadObserved;
use App\Services\Cartables\RoadObservation\ReportService; use App\Services\Cartables\RoadObservation\ReportService;
use App\Services\Cartables\SafetyAndPrivacy\OperatorService; use App\Services\Cartables\SafetyAndPrivacy\OperatorService;
@@ -46,14 +47,12 @@ class ReportController
public function countryActivity(Request $request, ReportService $reportService): JsonResponse public function countryActivity(Request $request, ReportService $reportService): JsonResponse
{ {
$data = $reportService->countryActivity($request); $data = $reportService->countryActivity($request);
return response()->json($data['data']); return $this->successResponse($data);
} }
public function provinceActivity(Request $request, ReportService $reportService): JsonResponse public function provinceActivity(Request $request, ReportService $reportService): JsonResponse
{ {
$data = $reportService->provinceActivity( $data = $reportService->provinceActivity(
province_id: $request->input('province_id') province_id: $request->input('province_id')
); );
@@ -65,7 +64,7 @@ class ReportController
} }
public function countryActivityExcel(Request $request, OperatorService $operatorService): BinaryFileResponse public function countryActivityExcel(Request $request, OperatorService $operatorService): BinaryFileResponse
{ {
$data = $operatorService->countryActivity(); $data = $operatorService->countryActivity($request);
$name = 'گزارش رسیدگی به شکایات واکنش سریع' . verta()->now()->format('Y-m-d H-i') . '.xlsx'; $name = 'گزارش رسیدگی به شکایات واکنش سریع' . verta()->now()->format('Y-m-d H-i') . '.xlsx';
return Excel::download(new CountryCartableReport($data), $name); return Excel::download(new CountryCartableReport($data), $name);
} }

3
app/Services/Cartables/RoadObservation/ReportService.php
View File

@@ -132,13 +132,10 @@ class ReportService
edarate_shahri e edarate_shahri e
LEFT JOIN LEFT JOIN
road_observeds t ON t.edarate_shahri_id = e.id AND t.province_id = e.province_id road_observeds t ON t.edarate_shahri_id = e.id AND t.province_id = e.province_id
WHERE
e.province_id = :provinceId
ORDER BY ORDER BY
edare_id edare_id
", [ ", [
'provinceId' => $province_id, 'provinceId' => $province_id,
]); ]);
} }
} }