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-09-08 18:27:41 +08:00
commit ae05ee61d8
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

@ -335,7 +335,7 @@ class IndexController extends BaseApiController
//获取租赁车辆信息 //获取租赁车辆信息
$vehicleRentInfo = VehicleRent::where('car_id', $vehicle['id'])->find(); $vehicleRentInfo = VehicleRent::where('car_id', $vehicle['id'])->find();
//更新原始合同类型 //更新原始合同类型
VehicleContract::where('id', $vehicleRentInfo['contract_id'])->update(['type' => 2]); VehicleContract::where('id', $vehicleRentInfo['contract_id'])->update(['status' => 6]);
VehicleRent::where('car_id', $vehicle['id'])->update([ VehicleRent::where('car_id', $vehicle['id'])->update([
'status' => 3, 'status' => 3,
]); ]);

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

@ -237,7 +237,7 @@ class VehicleController extends BaseApiController
return $this->fail('当前镇街公司未签约'); return $this->fail('当前镇街公司未签约');
} }
//判断是否申请过 //判断是否申请过
$vehicleContract = VehicleContract::where('company_b_id',$this->userInfo['company_id'])->where('type','<>',2)->where('status','<>',4)->find(); $vehicleContract = VehicleContract::where('company_b_id',$this->userInfo['company_id'])->where('type','<>',2)->whereNotIn('status','4,5,6')->find();
if(!empty($vehicleContract)){ if(!empty($vehicleContract)){
return $this->fail('请勿重复申请'); return $this->fail('请勿重复申请');
} }