mkm/TaskSystem
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev' into dev

Browse Source
This commit is contained in:
chenbo 2023-10-18 10:32:00 +08:00
commit b08274f2f7
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/adminapi/controller/contract/VehicleContractController.php
View File

@ -269,6 +269,7 @@ class VehicleContractController extends BaseAdminController
} }
$data['cars_info'] = json_decode($data['cars_info'],true); $data['cars_info'] = json_decode($data['cars_info'],true);
$cars = $data['cars_info']; $cars = $data['cars_info'];
if(!empty($cars)){
foreach ($cars as $k=>$v) { foreach ($cars as $k=>$v) {
$rent_info = VehicleRent::where('car_id',$v['id'])->findOrEmpty(); $rent_info = VehicleRent::where('car_id',$v['id'])->findOrEmpty();
if(!$rent_info->isEmpty()){ if(!$rent_info->isEmpty()){
@ -276,6 +277,7 @@ class VehicleContractController extends BaseAdminController
$cars[$k]['rent_time'] = !empty($rent_info['rent_time']) ? $rent_info['rent_time'] : $rent_info['create_time']; $cars[$k]['rent_time'] = !empty($rent_info['rent_time']) ? $rent_info['rent_time'] : $rent_info['create_time'];
} }
} }
}
$data['cars_info'] = $cars; $data['cars_info'] = $cars;
return $this->success('success',$data->toArray()); return $this->success('success',$data->toArray());
} }