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

Reviewed-on: http://git.excellentkk.cn/mkm/TaskSystem/pulls/99
This commit is contained in:
wei1990 2023-09-01 15:30:39 +08:00
commit 70736b1681

View File

@ -4,6 +4,7 @@ namespace app\api\controller;
use app\common\enum\notice\NoticeEnum;
use app\common\model\Company;
use app\common\model\contract\Contract;
use app\common\model\contract\VehicleContract;
use app\common\model\vehicle\VehicleRent;
use think\facade\Db;
@ -21,7 +22,7 @@ class VehicleController extends BaseApiController
return $this->fail('缺少必要参数');
}
//获取该公司已签约的小组服务公司数量
$villageCompany = VehicleRent::field('id')->where('party_a',$this->userInfo['company_id'])->where('signing_timer',2)->count();
$villageCompany = Contract::field('id')->where('party_a',$this->userInfo['company_id'])->where('signing_timer',2)->count();
//系统车辆数量
$rentCar = VehicleRent::field('id')->where('company_id',$this->userInfo['company_id'])->where('status','<>',3)->where('type',0)->count();
//申请中的车辆
@ -342,7 +343,7 @@ class VehicleController extends BaseApiController
}
})->toArray();
//获取该公司已签约的小组服务公司数量
$villageCompany = VehicleContract::field('id')->where('party_a',$company['id'])->where('signing_timer',2)->count();
$villageCompany = Contract::field('id')->where('party_a',$company['id'])->where('signing_timer',2)->count();
//系统车辆数量
$rentCar = VehicleRent::field('id')->where('company_id',$company['id'])->where('status','<>', 3)->where('type',0)->count();
//申请中的车辆