From 7304ec1e3fc2355a628398e5cf82601f80bcefd7 Mon Sep 17 00:00:00 2001 From: unknown <736250432@qq.com> Date: Tue, 5 Sep 2023 17:46:03 +0800 Subject: [PATCH] update --- app/api/controller/IndexController.php | 2 +- app/api/controller/VehicleController.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/api/controller/IndexController.php b/app/api/controller/IndexController.php index 032c7eae5..f350b8e57 100755 --- a/app/api/controller/IndexController.php +++ b/app/api/controller/IndexController.php @@ -333,7 +333,7 @@ class IndexController extends BaseApiController $data[$k]['company_id'] = $model['company_b_id']; $data[$k]['rent_time'] = 0; $data[$k]['rent_company_id'] = 0; - $data[$k]['contract_id'] = 0; + $data[$k]['contract_id'] = $model['id']; $data[$k]['create_time'] = strtotime($model['create_time']); } $vehicleRent = new VehicleRent(); diff --git a/app/api/controller/VehicleController.php b/app/api/controller/VehicleController.php index 068e56bd7..a94fd58a2 100644 --- a/app/api/controller/VehicleController.php +++ b/app/api/controller/VehicleController.php @@ -415,7 +415,7 @@ class VehicleController extends BaseApiController return $this->fail('数据错误'); } $data['mileage'] = 0; - if($data['status'] == 3){ + if($data['status'] == 2){ $data['company'] = Company::field('company_name,master_name as user_name,master_phone as user_phone,province,city,area,street,village,brigade')->where('id',$data['rent_company_id'])->find()->append(['province_name', 'city_name', 'area_name', 'street_name', 'village_name','brigade_name']); //获取合同 $data['contract'] = VehicleContract::field('id,contract_no,contract_url,file,status,create_time,update_time')->where('id',$data['contract_id'])->findOrEmpty();