From 0e44a4d916c15018bb7124ceae3d223bb82e5fac Mon Sep 17 00:00:00 2001
From: unknown <736250432@qq.com>
Date: Fri, 8 Sep 2023 16:47:30 +0800
Subject: [PATCH 1/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=A7=A3=E9=99=A4?=
 =?UTF-8?q?=E5=90=88=E5=90=8C=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/api/controller/VehicleController.php | 38 +++++++++++++-----------
 1 file changed, 21 insertions(+), 17 deletions(-)

diff --git a/app/api/controller/VehicleController.php b/app/api/controller/VehicleController.php
index df7f43db4..35d829740 100644
--- a/app/api/controller/VehicleController.php
+++ b/app/api/controller/VehicleController.php
@@ -22,8 +22,8 @@ class VehicleController extends BaseApiController
         }
         //获取该公司已签约的小组服务公司数量
         $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();
+        //已经租赁车辆
+        $rentCar = VehicleRent::field('id')->where('company_id',$this->userInfo['company_id'])->where('type','<>', 1)->count();
         //申请中的车辆
         $applyCar = VehicleContract::field('num')->where('company_b_id',$this->userInfo['company_id'])->where('status','in','-1,0,1,2')->sum('num');
         //自有车辆数量
@@ -361,8 +361,8 @@ class VehicleController extends BaseApiController
         })->toArray();
         //获取该公司已签约的小组服务公司数量
         $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();
+        //已经租赁车辆
+        $rentCar = VehicleRent::field('id')->where('company_id',$company['id'])->where('type','<>', 1)->count();
         //申请中的车辆
         $applyCar = VehicleContract::field('num')->where('company_b_id',$company['id'])->where('status','in','-1,0,1,2')->sum('num');
         //自有车辆数量
@@ -393,13 +393,7 @@ class VehicleController extends BaseApiController
             return $this->fail('非小组公司不能访问');
         }
         //获取申请信息
-        $vehicleContract = VehicleContract::where('company_b_id',$company['id'])->order('id desc')->find();
-        if(empty($vehicleContract)){
-            return $this->success('没有数据，请申请',['status'=>-2]);
-        }
-        if($vehicleContract['type'] == 2){
-            return $this->success('合同已解除',['status'=>-3]);
-        }
+        $vehicleContract = VehicleContract::where('company_b_id',$company['id'])->order('id desc')->findOrEmpty();
         if($vehicleContract['status'] == 3){
             if(!empty($vehicleContract['cars_info'])){
                 $vehicleContract['cars_info'] = json_decode($vehicleContract['cars_info'],true);
@@ -528,12 +522,22 @@ class VehicleController extends BaseApiController
             'update_time' => time(),
             'old_file' => $contract['contract_url'],
         ];
-        //写入数据
-        $result = VehicleContract::create($data);
-        if($result){
-            return $this->success('申请成功，待镇街公司审核');
-        }else{
-            return $this->fail('申请失败，请稍后重试');
+        Db::startTrans();
+        try{
+            //写入数据
+            $new_result = VehicleContract::create($data);
+            //修改原合同状态
+            $old_result = VehicleContract::where('id',$contract['id'])->update(['status',5]);
+            if($new_result && $old_result){
+                Db::commit();
+                return $this->success('申请成功，待镇街公司审核');
+            }else{
+                Db::rollback();
+                return $this->fail('申请失败，请稍后重试');
+            }
+        }catch (\Exception $e) {
+            Db::rollback();
+            return $this->fail($e->getMessage());
         }
     }
 

From 5ac96927d254eccaa593ca7e5d49b5cb6fa17539 Mon Sep 17 00:00:00 2001
From: unknown <736250432@qq.com>
Date: Fri, 8 Sep 2023 16:58:09 +0800
Subject: [PATCH 2/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=A7=A3=E9=99=A4?=
 =?UTF-8?q?=E5=90=88=E5=90=8C=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/api/controller/VehicleController.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/api/controller/VehicleController.php b/app/api/controller/VehicleController.php
index 35d829740..d4e4dc20b 100644
--- a/app/api/controller/VehicleController.php
+++ b/app/api/controller/VehicleController.php
@@ -527,7 +527,7 @@ class VehicleController extends BaseApiController
             //写入数据
             $new_result = VehicleContract::create($data);
             //修改原合同状态
-            $old_result = VehicleContract::where('id',$contract['id'])->update(['status',5]);
+            $old_result = VehicleContract::where('id',$contract['id'])->update(['status'=>5]);
             if($new_result && $old_result){
                 Db::commit();
                 return $this->success('申请成功，待镇街公司审核');

From 60d28963cb65a2264b1be5981c9f0ec37c52e0f8 Mon Sep 17 00:00:00 2001
From: unknown <736250432@qq.com>
Date: Fri, 8 Sep 2023 17:13:33 +0800
Subject: [PATCH 3/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A9=B3=E5=9B=9E?=
 =?UTF-8?q?=E7=94=B3=E8=AF=B7=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/api/controller/VehicleController.php | 50 ++++++++++++++++++++----
 1 file changed, 42 insertions(+), 8 deletions(-)

diff --git a/app/api/controller/VehicleController.php b/app/api/controller/VehicleController.php
index d4e4dc20b..33c44aedc 100644
--- a/app/api/controller/VehicleController.php
+++ b/app/api/controller/VehicleController.php
@@ -299,15 +299,49 @@ class VehicleController extends BaseApiController
         if($vehicleContract['company_a_id'] != $this->userInfo['company_id']){
             return $this->fail('数据不匹配');
         }
-        //更新
-        $result = VehicleContract::where('id',$params['id'])->update([
-            'status' => 4,
-            'reject_message' => $params['content']
-        ]);
-        if($result){
-            return $this->success('驳回成功');
+        //判断合同类型
+        if($vehicleContract['type'] == 2){
+            Db::startTrans();
+            try{
+                //查找原合同
+                $car = json_decode($vehicleContract['cars_info'],true);
+                $carRentInfo = VehicleRent::where('car_id',$car['id'])->findOrEmpty();
+                $oldVehicleContractUpdate = VehicleContract::where('id',$carRentInfo['contract_id'])->update(['status'=>3]);
+                //更新
+                $result = VehicleContract::where('id',$params['id'])->update([
+                    'status' => 4,
+                    'reject_message' => $params['content']
+                ]);
+                if($oldVehicleContractUpdate && $result){
+                    Db::commit();
+                    return $this->success('驳回成功');
+                }else{
+                    Db::rollback();
+                    return $this->fail('驳回失败');
+                }
+            }catch (\Exception $e) {
+                Db::rollback();
+                return $this->fail($e->getMessage());
+            }
         }else{
-            return $this->fail('驳回失败');
+            Db::startTrans();
+            try{
+                //更新
+                $result = VehicleContract::where('id',$params['id'])->update([
+                    'status' => 4,
+                    'reject_message' => $params['content']
+                ]);
+                if($result){
+                    Db::commit();
+                    return $this->success('驳回成功');
+                }else{
+                    Db::rollback();
+                    return $this->fail('驳回失败');
+                }
+            }catch (\Exception $e) {
+                Db::rollback();
+                return $this->fail($e->getMessage());
+            }
         }
     }
 

From 5145f1eb0fc5450db71896cda4b2d3d792348a60 Mon Sep 17 00:00:00 2001
From: unknown <736250432@qq.com>
Date: Fri, 8 Sep 2023 17:14:45 +0800
Subject: [PATCH 4/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A9=B3=E5=9B=9E?=
 =?UTF-8?q?=E7=94=B3=E8=AF=B7=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/api/controller/VehicleController.php | 26 ++++++++----------------
 1 file changed, 9 insertions(+), 17 deletions(-)

diff --git a/app/api/controller/VehicleController.php b/app/api/controller/VehicleController.php
index 33c44aedc..7a2039004 100644
--- a/app/api/controller/VehicleController.php
+++ b/app/api/controller/VehicleController.php
@@ -324,23 +324,15 @@ class VehicleController extends BaseApiController
                 return $this->fail($e->getMessage());
             }
         }else{
-            Db::startTrans();
-            try{
-                //更新
-                $result = VehicleContract::where('id',$params['id'])->update([
-                    'status' => 4,
-                    'reject_message' => $params['content']
-                ]);
-                if($result){
-                    Db::commit();
-                    return $this->success('驳回成功');
-                }else{
-                    Db::rollback();
-                    return $this->fail('驳回失败');
-                }
-            }catch (\Exception $e) {
-                Db::rollback();
-                return $this->fail($e->getMessage());
+            //更新
+            $result = VehicleContract::where('id',$params['id'])->update([
+                'status' => 4,
+                'reject_message' => $params['content']
+            ]);
+            if($result){
+                return $this->success('驳回成功');
+            }else{
+                return $this->fail('驳回失败');
             }
         }
     }

From a479ddbcea403dbeb22b22dc2595d9f1695f2481 Mon Sep 17 00:00:00 2001
From: unknown <736250432@qq.com>
Date: Fri, 8 Sep 2023 17:20:36 +0800
Subject: [PATCH 5/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=B0=8F=E7=BB=84?=
 =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E5=85=AC=E5=8F=B8=E9=A6=96=E9=A1=B5=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/api/controller/VehicleController.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/api/controller/VehicleController.php b/app/api/controller/VehicleController.php
index 7a2039004..471c8f776 100644
--- a/app/api/controller/VehicleController.php
+++ b/app/api/controller/VehicleController.php
@@ -419,7 +419,7 @@ class VehicleController extends BaseApiController
             return $this->fail('非小组公司不能访问');
         }
         //获取申请信息
-        $vehicleContract = VehicleContract::where('company_b_id',$company['id'])->order('id desc')->findOrEmpty();
+        $vehicleContract = VehicleContract::where('company_b_id',$company['id'])->where('type','<>',2)->order('id desc')->findOrEmpty();
         if($vehicleContract['status'] == 3){
             if(!empty($vehicleContract['cars_info'])){
                 $vehicleContract['cars_info'] = json_decode($vehicleContract['cars_info'],true);