异常处理

app/Http/Controllers/Admin/SportsbqController.php

@@ -52,24 +52,31 @@ class SportsbqController extends Controller {
 				$where[] = array('st_bq_result.home_team', 'like', '%' . $home_team . '%');
 				$orwhere[] = array('st_bq_result.guest_team', 'like', '%' . $home_team . '%');
 			} else {
-				$where[] = array('st_bq_result.home_team', '=', $home_team);
-				$orwhere[] = array('st_bq_result.guest_team', '=', $home_team);
+				if(is_numeric($home_team)){
+					$where[] = array('st_bq_result.match_id', '=', $home_team);
+				}else{
+					$where[] = array('st_bq_result.home_team', '=', $home_team);
+					$orwhere[] = array('st_bq_result.guest_team', '=', $home_team);
+				}
 			}
 		}
         if ($status != -1) {
 			$where[] = array('st_bq_result.status', '=', $status);
 			$orwhere[] = array('st_bq_result.status', '=', $status);
 		}
-		if (!empty($star_time)) {
+		if(!is_numeric($home_team)){
+			if (!empty($star_time)) {
 	            $star_time = date('Y-m-d H:i:s', strtotime($star_time));
 	            $where[] = array('st_bq_result.start_time', '>', $star_time);
 	            $orwhere[] = array('st_bq_result.start_time', '>', $star_time);
 	        }
-	    if (!empty($end_time)) {
-	        $end_time = date('Y-m-d H:i:s', strtotime($end_time));
-	        $where[] = array('st_bq_result.start_time', '<', $end_time);
-	        $orwhere[] = array('st_bq_result.start_time', '<', $end_time);
+	        if (!empty($end_time)) {
+	            $end_time = date('Y-m-d H:i:s', strtotime($end_time));
+	            $where[] = array('st_bq_result.start_time', '<', $end_time);
+	            $orwhere[] = array('st_bq_result.start_time', '<', $end_time);
+	        }
 	    }
+		
 		$newapp = new \App\Models\Stbqresult();
         $data = $newapp->getinfo($list, $page, $where,$orwhere);
         

app/Http/Controllers/Admin/SportswqController.php

@@ -60,10 +60,26 @@ class SportswqController extends Controller {
 				$where[] = array('st_wq_result.home_player_name', 'like', '%' . $home_team . '%');
 				$orwhere[] = array('st_wq_result.guest_player_name', 'like', '%' . $home_team . '%');
 			} else {
-				$where[] = array('st_wq_result.home_player_name', '=', $home_team);
-				$orwhere[] = array('st_wq_result.guest_player_name', '=', $home_team);
+				if(is_numeric($home_team)){
+					$where[] = array('st_wq_result.match_id', '=', $home_team);
+				}else{
+					$where[] = array('st_wq_result.home_player_name', '=', $home_team);
+					$orwhere[] = array('st_wq_result.guest_player_name', '=', $home_team);
+				}
 			}
 		}
+		if(!is_numeric($home_team)){
+			if (!empty($star_time)) {
+	            $star_time = date('Y-m-d H:i:s', strtotime($star_time));
+	            $where[] = array('st_wq_result.start_time', '>', $star_time);
+	            $orwhere[] = array('st_wq_result.start_time', '>', $star_time);
+	        }
+	        if (!empty($end_time)) {
+	            $end_time = date('Y-m-d H:i:s', strtotime($end_time));
+	            $where[] = array('st_wq_result.start_time', '<', $end_time);
+	            $orwhere[] = array('st_wq_result.start_time', '<', $end_time);
+	        }
+	    }
 		if ($status != -1) {
 			$where[] = array('st_wq_result.status', '=', $status);
 			$orwhere[] = array('st_wq_result.status', '=', $status);
@@ -72,16 +88,7 @@ class SportswqController extends Controller {
 			$where[] = array('st_wq_result.name_chinese', '=', $name_chinese);
 			$orwhere[] = array('st_wq_result.name_chinese', '=', $name_chinese);
 		}
-		if (!empty($star_time)) {
-            $star_time = date('Y-m-d H:i:s', strtotime($star_time));
-            $where[] = array('st_wq_result.start_time', '>', $star_time);
-            $orwhere[] = array('st_wq_result.start_time', '>', $star_time);
-        }
-        if (!empty($end_time)) {
-            $end_time = date('Y-m-d H:i:s', strtotime($end_time));
-            $where[] = array('st_wq_result.start_time', '<', $end_time);
-            $orwhere[] = array('st_wq_result.start_time', '<', $end_time);
-        }
+
         $newapp = new \App\Models\Stwqresult();
         $data = $newapp->resultlist($list, $page, $where, $orwhere);
         

app/Models/Stbqresult.php

@@ -11,10 +11,10 @@ class Stbqresult extends BaseModel {
     protected $table = "st_bq_result";
     public $timestamps = false;
 
-    function getinfo($list = 10, $page, $where = '',$whereor = '')
+    function getinfo($list = 10, $page, $where = '',$orwhere = '')
     {
     	if (is_array ($where) && count ($where) > 0) {
-            $data = $this->join('st_bq_league','st_bq_result.lg_id','=','st_bq_league.id')->join('st_bq_competition','st_bq_competition.id','=','st_bq_result.match_id')->select($this->table.'.id',$this->table.'.home_team',$this->table.'.guest_team',$this->table.'.match_id','st_bq_result.guest_team','st_bq_result.home_rate','st_bq_result.guest_rate','st_bq_result.first_score','st_bq_result.status','st_bq_result.last_score','st_bq_result.match_score','st_bq_result.match_winer','st_bq_result.update_time','st_bq_competition.match_time','st_bq_result.match_process',$this->table.'.home_score',$this->table.'.guest_score',$this->table.'.u_guest_score',$this->table.'.u_home_score',$this->table.'.start_time','st_bq_league.name_chinese as saisname')->orderby('st_bq_result.id','desc')->where($where)->paginate ($list);
+            $data = $this->join('st_bq_league','st_bq_result.lg_id','=','st_bq_league.id')->join('st_bq_competition','st_bq_competition.id','=','st_bq_result.match_id')->select($this->table.'.id',$this->table.'.home_team',$this->table.'.guest_team',$this->table.'.match_id','st_bq_result.guest_team','st_bq_result.home_rate','st_bq_result.guest_rate','st_bq_result.first_score','st_bq_result.status','st_bq_result.last_score','st_bq_result.match_score','st_bq_result.match_winer','st_bq_result.update_time','st_bq_competition.match_time','st_bq_result.match_process',$this->table.'.home_score',$this->table.'.guest_score',$this->table.'.u_guest_score',$this->table.'.u_home_score',$this->table.'.start_time','st_bq_league.name_chinese as saisname')->orderby('st_bq_result.id','desc')->where($where)->orwhere($orwhere)->paginate ($list);
         } else { 
         	$data = $this->join('st_bq_league','st_bq_result.lg_id','=','st_bq_league.id')->join('st_bq_competition','st_bq_competition.id','=','st_bq_result.match_id')->select($this->table.'.id',$this->table.'.home_team',$this->table.'.guest_team',$this->table.'.match_id','st_bq_result.guest_team','st_bq_result.home_rate','st_bq_result.guest_rate','st_bq_result.first_score','st_bq_result.status','st_bq_result.last_score','st_bq_result.match_score','st_bq_result.match_winer','st_bq_result.update_time','st_bq_competition.match_time','st_bq_result.match_process',$this->table.'.home_score',$this->table.'.guest_score',$this->table.'.u_guest_score',$this->table.'.u_home_score',$this->table.'.start_time','st_bq_league.name_chinese as saisname')->orderby('st_bq_result.id','desc')->paginate ($list);
         }

resources/views/admin/Sportsbq/outcome.blade.php

@@ -77,7 +77,7 @@
                     <div class="layui-inline">
                         <label class="layui-form-label">{{ trans('sportsbk.sousuo') }}</label>
                         <div class="layui-input-inline">
-                            <input type="text" name="home_team" id="home_team" eventType="event-query"  value="{{ $home_team }}" lay-verify="required" autocomplete="off" class="layui-input">
+                            <input type="text" name="home_team" id="home_team" eventType="event-query"  value="{{ $home_team }}" lay-verify="required" autocomplete="off" class="layui-input" placeholder="输入赛事id,主队,客队名">
                         </div>
                         <div class="layui-input-inline checkbox">
                             <input type="checkbox" name="sureblur" id="form_sureblur" lay-skin="switch" lay-text="精确|模糊" @if(!isset($sureblurs) || $sureblurs=='on') checked @endif  class="layui-input" eventType=event-query>

resources/views/admin/Sportswq/outcome.blade.php

@@ -70,7 +70,7 @@
                     <div class="layui-inline">
                         <label class="layui-form-label">{{ trans('sportsbk.sousuo') }}</label>
                         <div class="layui-input-inline">
-                            <input type="text" name="home_team" id="home_team" eventType="event-query"  value="{{ $home_team }}" lay-verify="required" autocomplete="off" class="layui-input">
+                            <input type="text" name="home_team" id="home_team" eventType="event-query"  value="{{ $home_team }}" lay-verify="required" autocomplete="off" class="layui-input" placeholder="输入赛事id,主队员,客队员">
                         </div>
                         <div class="layui-input-inline checkbox">
                             <input type="checkbox" name="sureblur" id="form_sureblur" lay-skin="switch" lay-text="精确|模糊" @if(!isset($sureblurs) || $sureblurs=='on') checked @endif  class="layui-input" eventType=event-query>

resources/views/admin/sportsbk/outcome.blade.php

@@ -198,7 +198,7 @@
                     <div class="layui-inline">
                         <label class="layui-form-label">{{ trans('sportsbk.sousuo') }}</label>
                         <div class="layui-input-inline">
-                            <input type="text" name="home_team" id="home_team" eventType="event-query"  value="{{ $home_team }}" lay-verify="required" autocomplete="off" class="layui-input" placeholder="输入主队,客队名">
+                            <input type="text" name="home_team" id="home_team" eventType="event-query"  value="{{ $home_team }}" lay-verify="required" autocomplete="off" class="layui-input" placeholder="输入赛事id,主队,客队名">
                         </div>
                         <div class="layui-input-inline checkbox">
                             <input type="checkbox" name="sureblur" id="form_sureblur" lay-skin="switch" lay-text="精确|模糊" @if(!isset($sureblurs) || $sureblurs=='on') checked @endif  class="layui-input" eventType=event-query>