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

增加公司下面车辆列表接口

Browse Source
This commit is contained in:
unknown 2023-08-23 18:58:45 +08:00
parent 25edccb9a4
commit 7016b66c56
3 changed files with 35 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -11,7 +11,7 @@ use think\response\Json;
*/ */
class VehicleController extends BaseApiController class VehicleController extends BaseApiController
{ {
public array $notNeedLogin = ['getCompany','setContract','getRentRecord','updateRentRecord','tricycle','multipleRent','singleRent']; public array $notNeedLogin = ['getCompany','setContract','getRentRecord','updateRentRecord','getCompanyCars'];
/* /*
*获取平台公司接口 *获取平台公司接口
@ -85,4 +85,18 @@ class VehicleController extends BaseApiController
return $this->fail($result['msg']); return $this->fail($result['msg']);
} }
} }
public function getCompanyCars() {
$params = $this->request->get(['company_id','company_type']);
if(empty($params['company_id']) || empty($params['company_type'])){
return $this->fail('缺少必要参数');
}
$result = VehicleLogic::getCompanyCars($params);
//返回数据
if($result['code'] == 1){
return $this->success($result['msg'],$result['data']);
}else{
return $this->fail($result['msg']);
}
}
} }

21
app/api/logic/VehicleLogic.php
View File

@ -29,7 +29,7 @@ use app\common\model\vehicle\VehicleRentRecord;
*/ */
class VehicleLogic extends BaseLogic class VehicleLogic extends BaseLogic
{ {
public static function companyInfo() { public static function companyInfo():array {
$data = Company::field('id,company_name')->where('company_name',30)->select(); $data = Company::field('id,company_name')->where('company_name',30)->select();
if($data){ if($data){
return ['code'=>1,'msg'=>'请求成功','data'=>$data->toArray()]; return ['code'=>1,'msg'=>'请求成功','data'=>$data->toArray()];
@ -91,7 +91,7 @@ class VehicleLogic extends BaseLogic
} }
} }
public static function rendRecordInfo($contract_id) { public static function rendRecordInfo($contract_id):array {
$record = VehicleRentRecord::field('car_ids,num,start_time,end_time')->where('contract_id',$contract_id)->find(); $record = VehicleRentRecord::field('car_ids,num,start_time,end_time')->where('contract_id',$contract_id)->find();
if(!$record){ if(!$record){
return ['code'=>0,'msg'=>'数据不存在']; return ['code'=>0,'msg'=>'数据不存在'];
@ -110,7 +110,7 @@ class VehicleLogic extends BaseLogic
return ['code'=>1,'msg'=>'请求成功','data'=>$data]; return ['code'=>1,'msg'=>'请求成功','data'=>$data];
} }
public static function rendRecordEdit($contract_id) { public static function rendRecordEdit($contract_id):array {
$record = VehicleRentRecord::where('contract_id',$contract_id)->where('status',1)->find(); $record = VehicleRentRecord::where('contract_id',$contract_id)->where('status',1)->find();
if(!$record){ if(!$record){
return ['code'=>0,'msg'=>'数据不存在']; return ['code'=>0,'msg'=>'数据不存在'];
@ -183,4 +183,19 @@ class VehicleLogic extends BaseLogic
return ['code'=>0,'msg'=>$e->getMessage()]; return ['code'=>0,'msg'=>$e->getMessage()];
} }
} }
public static function getCompanyCars($params):array {
$company_str = $params['company_type'] == 1 ? 'lessee_one_company_id' : 'lessee_two_company_id';
$data = VehicleRent::field('car_id')->where($company_str,$params['company_id'])->select()->each(function($item){
$car = Vehicle::field('license,gps_imei')->where('id',$item['car_id'])->find();
$item['gps_imei'] = $car['gps_imei'];
$item['license'] = $car['license'];
return $item;
});
if($data){
return ['code'=>1,'msg'=>'请求成功','data'=>$data->toArray()];
}else{
return ['code'=>1,'msg'=>'请求失败'];
}
}
} }

3
app/api/route/app.php
View File

@ -34,4 +34,5 @@ Route::rule('getCarHistory','Gps/getCarHistory','get');
Route::rule('getCompany','Vehicle/getCompany','get'); Route::rule('getCompany','Vehicle/getCompany','get');
Route::rule('setContract','Vehicle/setContract','post'); Route::rule('setContract','Vehicle/setContract','post');
Route::rule('getRentRecord','Vehicle/getRentRecord','get'); Route::rule('getRentRecord','Vehicle/getRentRecord','get');
Route::rule('updateRentRecord','Vehicle/updateRentRecord','post'); Route::rule('updateRentRecord','Vehicle/updateRentRecord','post');
Route::rule('getCompanyCars','Vehicle/getCompanyCars','get');