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

Merge pull request 'create two record for report' (#20) from feature/MachineTypesDetails into develop

Browse Source 
Reviewed-on: #20
This commit was merged in pull request #20.
This commit is contained in:
amirghasempoor
2026-06-14 07:16:11 +00:00
parent ace0b018e7 5a2a477789
commit fc853d318e
3 changed files with 34 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
app/Http/Controllers/V3/Dashboard/Mission/Report/ReportMachineController.php
View File

@@ -7,11 +7,13 @@ use App\Facades\DataTable\DataTableFacade;
use App\Http\Controllers\Controller;
use App\Http\Traits\ApiResponse;
use App\Models\City;
use App\Models\CMMSMachine;
use App\Models\Mission;
use App\Models\Province;
use App\Services\Cartables\Mission\Report\ReportMachineService;
use Illuminate\Http\JsonResponse;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\DB;
use Maatwebsite\Excel\Facades\Excel;
use PhpOffice\PhpSpreadsheet\Exception;
use Symfony\Component\HttpFoundation\BinaryFileResponse;
@@ -147,4 +149,33 @@ class ReportMachineController extends Controller
// ->get(['id', 'name_fa'])
]);
}
public function machineTypeDetailsReport(Request $request)
{
$machineIds = CMMSMachine::query()->where('car_type', '=', $request->query('car_type'))->pluck('machine_id');
return DataTableFacade::run(
Mission::query()->whereIn('machine_id', $machineIds),
$request,
allowedFilters: ['*'],
allowedSortings: ['*'],
allowedSelects: [
'id', 'province_id', 'province_name', 'city_id', 'city_name',
'end_km', 'km', 'driver_name', 'state_name', 'station_name'
]
);
}
public function machineDriverDetailsReport(Request $request)
{
return DataTableFacade::run(
Mission::query()->where('driver_id', '=', $request->query('driver_id')),
$request,
allowedFilters: ['*'],
allowedSortings: ['*'],
allowedSelects: [
'id', 'province_id', 'province_name', 'city_id', 'city_name',
'end_km', 'km', 'driver_name', 'state_id', 'station_name'
]
);
}
}

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

@@ -83,7 +83,7 @@ class ReportMachineService
SUM(m.end_km - m.km) AS func
FROM missions m
JOIN cmms_machines cm ON cm.id = m.machine_id
WHERE m.state_id = 4 AND m.start_time >= :from AND m.finish_time <= :to AND province_id = :province_id
WHERE m.state_id = 4 AND m.start_time >= :from AND m.finish_time <= :to AND m.province_id = :province_id
GROUP BY cm.car_type;";
return DB::select($sql, [

2
routes/v3.php
View File

@@ -575,6 +575,8 @@ Route::prefix('missions')
Route::get('/machine_details_report', 'machineDetailsReport')->name('machineDetailsReport');
Route::get('/country_machine_drivers_activity', 'countryMachineDriversActivity')->name('countryMachineDriversActivity');
Route::get('/province_machine_drivers_activity', 'provinceMachineDriversActivity')->name('provinceMachineDriversActivity');
Route::get('/machine_driver_details_report', 'machineDriverDetailsReport')->name('machineDriverDetailsReport');
Route::get('/machine_type_details_report', ' machineTypeDetailsReport')->name('machineTypeDetailsReport');
});
});