修改

catch/yunying/controller/Vehicle.php

@@ -39,26 +39,27 @@ class Vehicle extends CatchController
         if($param['PLATE_NO']){
             $cond['o.PLATE_NO']=['like',$param['PLATE_NO']];
         }
-        // if($param['ID_CARD_NUMBER']){
-        //     $cond['r.ID_CARD_NUMBER']=['like',$param['ID_CARD_NUMBER']];
-        // }
-        // if($param['MOBILE_NUMBER']){
-        //     $cond['r.MOBILE_NUMBER']=['like',$param['MOBILE_NUMBER']];
-        // }
+        if($param['ID_CARD_NUMBER']){
+            $cond['r.ID_CARD_NUMBER']=['like',$param['ID_CARD_NUMBER']];
+        }
+        if($param['MOBILE_NUMBER']){
+            $cond['r.MOBILE_NUMBER']=['like',$param['MOBILE_NUMBER']];
+        }
         if($param['RFID_SN']){
             $cond['s.RFID_SN']=['like',$param['RFID_SN']];
         }
 
-        // $count=queryOracleCount('DSSC3.W_DW_NON_MOTOR o,DSSC3.W_DW_NON_MOTOR_OWNER r,DSSC3.W_DW_RFID_TAGS s',$cond);
-        $count=queryOracleCount('DSSC3.W_DW_NON_MOTOR o,DSSC3.W_DW_RFID_TAGS s',$cond);
+        $count=queryOracleCount('DSSC3.W_DW_NON_MOTOR o,DSSC3.W_DW_NON_MOTOR_OWNER r,DSSC3.W_DW_RFID_TAGS s',$cond);
+        // $count=queryOracleCount('DSSC3.W_DW_NON_MOTOR o,DSSC3.W_DW_RFID_TAGS s',$cond);
         // $count=100000;
         $cond['page']=isset($param['page'])?$param['page']:1;
         $cond['limit']=isset($param['limit'])?$param['limit']:10;
-        // $rows=queryOracleSelect('DSSC3.W_DW_NON_MOTOR o,DSSC3.W_DW_NON_MOTOR_OWNER r,DSSC3.W_DW_RFID_TAGS s',$cond,'o.PLATE_NO,s.RFID_SN,r. NAME,r.ID_CARD_NUMBER,r.MOBILE_NUMBER,r.HOME_ADDRESS');
-        $rows=queryOracleSelect('DSSC3.W_DW_NON_MOTOR o,DSSC3.W_DW_RFID_TAGS s',$cond,'o.PLATE_NO,o.CAR_TYPE,o.CAR_BRAND,s.ID,s.RFID_SN,s.INSTALLER,to_char(s.INSTA_DATE,\'yyyy-mm-dd hh24:mi:ss\') INSTA_DATE');
+        $rows=queryOracleSelect('DSSC3.W_DW_NON_MOTOR o,DSSC3.W_DW_NON_MOTOR_OWNER r,DSSC3.W_DW_RFID_TAGS s',$cond,'o.PLATE_NO,s.RFID_SN,r. NAME,r.ID_CARD_NUMBER,r.MOBILE_NUMBER,r.HOME_ADDRESS');
+        // $rows=queryOracleSelect('DSSC3.W_DW_NON_MOTOR o,DSSC3.W_DW_RFID_TAGS s',$cond,'o.PLATE_NO,o.CAR_TYPE,o.CAR_BRAND,s.ID,s.RFID_SN,s.INSTALLER,to_char(s.INSTA_DATE,\'yyyy-mm-dd hh24:mi:ss\') INSTA_DATE');
         foreach($rows as &$val){
             $val['CAR_BRAND_TEXT']=(new SysDictData())->getValueByCode('CAR_BRAND_OPTION',$val['CAR_BRAND']);
             $val['CAR_TYPE_TEXT']=(new SysDictData())->getValueByCode('CAR_TYPE_OPTION',$val['CAR_TYPE']);
+            $val['CARD_NUMBER_STR']=formatDataCardNumber($val['ID_CARD_NUMBER']);
         }
         $response=[
             'code'=>10000,
@@ -70,6 +71,7 @@ class Vehicle extends CatchController
         ];
         return $response;
     }
+
     public function getMapList(Request $request)
     {
         $param=$request->param();