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

add machine id

Browse Source
This commit is contained in:
amirghasempoor
2026-07-11 09:40:50 +03:30
parent 7a981ee421
commit d58ca6b685
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/Services/Cartables/Mission/Report/ReportMachineService.php
View File

@@ -22,13 +22,14 @@ class ReportMachineService
] ]
); );
} }
public function machinesActivity(Request $request): array public function machinesActivity(Request $request): array
{ {
$query = Mission::query() $query = Mission::query()
->join('cmms_machines as cm', 'cm.id', '=', 'missions.machine_id') ->join('cmms_machines as cm', 'cm.id', '=', 'missions.machine_id')
->where('state_id', '=', 4) ->where('state_id', '=', 4)
->when($request->province_id, function ($q) use ($request) { ->when($request->province_id, function ($q) use ($request) {
$q->where('missions.province_id', $request->province_id); $q->where('missions.province_id', '=', $request->province_id);
}) })
->selectRaw( ->selectRaw(
'cm.car_name, 'cm.car_name,
@@ -51,7 +52,7 @@ class ReportMachineService
public function dataTableMachineTypesActivity(Request $request,int $car_type): array public function dataTableMachineTypesActivity(Request $request,int $car_type): array
{ {
$machineIds = CMMSMachine::query()->where('car_type', '=', $request->query('car_type'))->pluck('machine_id'); $machineIds = CMMSMachine::query()->where('car_type', '=', $car_type)->pluck('machine_id');
return DataTableFacade::run( return DataTableFacade::run(
Mission::query()->whereIn('machine_id', $machineIds), Mission::query()->whereIn('machine_id', $machineIds),
$request, $request,