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-19 10:49:15 +08:00
commit 8b56240eaa
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -32,8 +32,13 @@ class VehicleController extends BaseApiController
//购买车辆数量 //购买车辆数量
//获取下面的小组服务公司 //获取下面的小组服务公司
$villageCompanys = Contract::field('party_b')->where('party_a',$this->userInfo['company_id'])->where('signing_timer',2)->select()->toArray(); $villageCompanys = Contract::field('party_b')->where('party_a',$this->userInfo['company_id'])->where('signing_timer',2)->select()->toArray();
$villageCompanys_ids = array_column($villageCompanys,'party_b'); $buyCar = 0;
$buyCar = VehicleContract::field('id')->where('company_b_id','in',$villageCompanys_ids)->where('type',3)->where('status','in','-1,0,1,2,3')->count(); foreach ($villageCompanys as $v) {
$aa = VehicleContract::field('id')->where('company_b_id',$v['party_b'])->where('type',3)->where('status','in','-1,0,1,2,3')->findOrEmpty();
if(!$aa->isEmpty()){
$buyCar += 1;
}
}
//可在租车辆 //可在租车辆
$doubleRentCar = max($villageCompany - $rentCar - $applyCar - $selfCar - $buyCar,0); $doubleRentCar = max($villageCompany - $rentCar - $applyCar - $selfCar - $buyCar,0);
if($params['num'] > $doubleRentCar ){ if($params['num'] > $doubleRentCar ){
@ -410,8 +415,13 @@ class VehicleController extends BaseApiController
//购买车辆数量 //购买车辆数量
//获取下面的小组服务公司 //获取下面的小组服务公司
$villageCompanys = Contract::field('party_b')->where('party_a',$company['id'])->where('signing_timer',2)->select()->toArray(); $villageCompanys = Contract::field('party_b')->where('party_a',$company['id'])->where('signing_timer',2)->select()->toArray();
$villageCompanys_ids = array_column($villageCompanys,'party_b'); $buyCar = 0;
$buyCar = VehicleContract::field('id')->where('company_b_id','in',$villageCompanys_ids)->where('type',3)->where('status','in','-1,0,1,2,3')->count(); foreach ($villageCompanys as $v) {
$aa = VehicleContract::field('id')->where('company_b_id',$v['party_b'])->where('type',3)->where('status','in','-1,0,1,2,3')->findOrEmpty();
if(!$aa->isEmpty()){
$buyCar += 1;
}
}
//可在租车辆 //可在租车辆
$doubleRentCar = max($villageCompany - $rentCar - $applyCar - $selfCar - $buyCar,0); $doubleRentCar = max($villageCompany - $rentCar - $applyCar - $selfCar - $buyCar,0);
//设置数据 //设置数据