修改

catch/yunying/controller/Vehicle.php

@@ -34,7 +34,7 @@ class Vehicle extends CatchController
         $param=$request->param();
         //联表条件o.rfid_id = s.id and o.owner_id = r.id 
         $cond=[
-            '_string'=>'o.rfid_id = s.id and o.owner_id = r.id',
+            '_string'=>'o.rfid_id = s.id and o.owner_id = r.id order by s.ID DESC',
         ];
         if($param['PLATE_NO']){
             $cond['o.PLATE_NO']=['like',$param['PLATE_NO']];
@@ -209,11 +209,17 @@ class Vehicle extends CatchController
         $sql='UPDATE DSSC3.W_DW_RFID_TAGS  SET RFID_SN = \''.$params['RFID_SN'].'\' WHERE ID = \''.$id.'\' ';
         $stid = oci_parse($conn, $sql);
         $r = oci_execute($stid);
-        
+        if(!$r){
+            oci_rollback($conn);
+            return CatchResponse::fail('修改失败');
+        }
         $sql='UPDATE DSSC3.W_DW_NON_MOTOR  SET PLATE_NO = \''.$params['PLATE_NO'].'\',CAR_BRAND=\''.$params['CAR_BRAND'].'\',CAR_TYPE=\''.$params['CAR_TYPE'].'\' WHERE RFID_ID = \''.$id.'\' ';
         $stid2 = oci_parse($conn, $sql);
         $r2 = oci_execute($stid2);
-
+        if(!$r2){
+            oci_rollback($conn);
+            return CatchResponse::fail('修改失败');
+        }
         //查车主ID
         $vehicle_sql='SELECT o.OWNER_ID FROM DSSC3.W_DW_NON_MOTOR o WHERE o.RFID_ID =\''.$id.'\' ';
         $owner_id='';
@@ -226,8 +232,11 @@ class Vehicle extends CatchController
 
         $stid3 = oci_parse($conn, $sql);
         $r3 = oci_execute($stid3);
-        
-   
+        if(!$r3){
+            oci_rollback($conn);
+            return CatchResponse::fail('修改失败');
+        }
+        oci_commit($conn);
         return CatchResponse::success('修改成功');
 
     }
@@ -252,15 +261,25 @@ class Vehicle extends CatchController
          $sql='DELETE FROM DSSC3.W_DW_NON_MOTOR_OWNER WHERE ID in ('.$owner_ids.')';
         $stid = oci_parse($conn, $sql);
         $r = oci_execute($stid);
-
+        if(!$r){
+            oci_rollback($conn);
+            return CatchResponse::fail('删除失败');
+        }
         
         $sql='DELETE FROM DSSC3.W_DW_RFID_TAGS WHERE ID in ('.$id.')';
         $stid = oci_parse($conn, $sql);
         $r = oci_execute($stid);
-
+        if(!$r){
+            oci_rollback($conn);
+            return CatchResponse::fail('删除失败');
+        }
         $sql='DELETE FROM DSSC3.W_DW_NON_MOTOR WHERE RFID_ID in ('.$id.')';
         $stid = oci_parse($conn, $sql);
         $r = oci_execute($stid);
+        if(!$r){
+            oci_rollback($conn);
+            return CatchResponse::fail('删除失败');
+        }
         return CatchResponse::success(true);
     }
     /**