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

Merge pull request 'update' (#11) from zhangwei into master

Browse Source 
Reviewed-on: #11
This commit is contained in:
weiz 2023-09-05 17:47:05 +08:00
commit 8a15d58f90
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/api/controller/IndexController.php
View File

@ -333,7 +333,7 @@ class IndexController extends BaseApiController
$data[$k]['company_id'] = $model['company_b_id']; $data[$k]['company_id'] = $model['company_b_id'];
$data[$k]['rent_time'] = 0; $data[$k]['rent_time'] = 0;
$data[$k]['rent_company_id'] = 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']); $data[$k]['create_time'] = strtotime($model['create_time']);
} }
$vehicleRent = new VehicleRent(); $vehicleRent = new VehicleRent();

2
app/api/controller/VehicleController.php
View File

@ -415,7 +415,7 @@ class VehicleController extends BaseApiController
return $this->fail('数据错误'); return $this->fail('数据错误');
} }
$data['mileage'] = 0; $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['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(); $data['contract'] = VehicleContract::field('id,contract_no,contract_url,file,status,create_time,update_time')->where('id',$data['contract_id'])->findOrEmpty();