后台赛事结果调整

app/Http/Controllers/Admin/SportsbkController.php

@@ -25,7 +25,7 @@ class SportsbkController extends Controller {
 		$dt->setDataSource('/admin/Sportsbk/info');
 		$dt->setLang('sportsbk');
 		$dt->addColsFields('lg_id', array('templet' => '#liansai', 'sort' => true, 'width' => 160));
-		// $dt->addColsFields('update_time', array('templet' => '#userdetail', 'sort' => true, 'width' => 160));
+		$dt->addColsFields('start_time', array('templet' => '#userdetail', 'sort' => true, 'width' => 160));
 		$dt->addColsFields('home_team', array('templet' => '#userdetail', 'sort' => false, 'width' => 100));
 		$dt->addColsFields('guest_team', array('templet' => '#userdetail', 'sort' => false, 'width' => 100));
 		$dt->addColsFields('dsnum', array('templet' => '#dsnum', 'sort' => false, 'width' => 70));
@@ -168,42 +168,18 @@ class SportsbkController extends Controller {
 		$data = $newapp->resultbklist($list, $page, $where, $orwhere);
 		
 		for ($i=0; $i < count($data['data']); $i++) { 
-			$match_id = $data['data'][$i]['match_id'];
-			$score = $newapp->allscore($match_id,5);
-
-			if(!empty($score[0])){
-				$data['data'][$i]['okteamscore'] = $score[0]['guest_score']?$score[0]['guest_score']:0;//第一节客队比分
-				$data['data'][$i]['ozteamscore'] = $score[0]['home_score']?$score[0]['home_score']:0;//第一节主队比分
-			}else{
-				$data['data'][$i]['okteamscore'] = 0;//第一节客队比分
-				$data['data'][$i]['ozteamscore'] = 0;//第一节主队比分
-			}
-			if(!empty($score[1])){
-				$data['data'][$i]['tkteamscore'] = $score[1]['guest_score']?$score[1]['guest_score']:0;//第二节客队比分
-				$data['data'][$i]['tzteamscore'] = $score[1]['home_score']?$score[1]['home_score']:0;//第二节主队比分
-			}else{
-				$data['data'][$i]['tkteamscore'] = 0;//第二节客队比分
-				$data['data'][$i]['tzteamscore'] = 0;//第二节主队比分
-			}
-			if(!empty($score[2])){
-				$data['data'][$i]['skteamscore'] = $score[2]['guest_score']?$score[2]['guest_score']:0;//第三节客队比分
-				$data['data'][$i]['szteamscore'] = $score[2]['home_score']?$score[2]['home_score']:0;//第三节主队比分
-			}else{
-				$data['data'][$i]['skteamscore'] = 0;//第三节客队比分
-				$data['data'][$i]['szteamscore'] = 0;//第三节主队比分
-			}
-			if(!empty($score[3])){
-				$data['data'][$i]['akteamscore'] = $score[3]['guest_score']?$score[3]['guest_score']:0;//第四节客队比分
-				$data['data'][$i]['azteamscore'] = $score[3]['home_score']?$score[3]['home_score']:0;//第四节主队比分
-			}else{
-				$data['data'][$i]['akteamscore'] = 0;//第四节客队比分
-				$data['data'][$i]['azteamscore'] = 0;//第四节主队比分
-			}
-		    unset($data['data'][$i]['match_process'],$data['data'][$i]['id'],$data['data'][$i]['home_score'],$data['data'][$i]['guest_score'],$data['data'][$i]['update_time']); //去重
+			$home_score = json_decode($data['data'][$i]['home_score'],true);
+			$guest_score = json_decode($data['data'][$i]['guest_score'],true);
+			$data['data'][$i]['okteamscore'] = $guest_score[1];//第一节客队比分
+			$data['data'][$i]['ozteamscore'] = $home_score[1];//第一节主队比分
+			$data['data'][$i]['tkteamscore'] = $guest_score[2];//第二节客队比分
+			$data['data'][$i]['tzteamscore'] = $home_score[2];//第二节主队比分
+			$data['data'][$i]['skteamscore'] = $guest_score[3];//第三节客队比分
+			$data['data'][$i]['szteamscore'] = $home_score[3];//第三节主队比分
+			$data['data'][$i]['akteamscore'] = $guest_score[4];//第四节客队比分
+			$data['data'][$i]['azteamscore'] = $home_score[4];//第四节主队比分
 		}
 
-		$data['data'] = array_unique($data['data'], SORT_REGULAR); //去重
-		// var_dump($data);die;
 		return \App\Lib\DataTable\DataTable::init()->toJson($data['data'], $data['total']);
 	}
 
@@ -211,36 +187,45 @@ class SportsbkController extends Controller {
 	function updatascore(Req $req){
 		$only = $req->only;//节数唯一标识
 		$match_id = $req->match_id;//节数唯一标识
-		$okteamscore = $req->okteamscore;//第一节客队比分
-		$ozteamscore = $req->ozteamscore;//第一节主队比分
-		$tkteamscore = $req->tkteamscore;//第二节客队比分
-		$tzteamscore = $req->tzteamscore;//第二节主队比分
-		$skteamscore = $req->skteamscore;//第三节客队比分
-		$szteamscore = $req->szteamscore;//第三节主队比分
-		$akteamscore = $req->akteamscore;//第四节客队比分
-		$azteamscore = $req->azteamscore;//第四节主队比分
+		$okteamscore = intval($req->okteamscore);//第一节客队比分
+		$ozteamscore = intval($req->ozteamscore);//第一节主队比分
+		$tkteamscore = intval($req->tkteamscore);//第二节客队比分
+		$tzteamscore = intval($req->tzteamscore);//第二节主队比分
+		$skteamscore = intval($req->skteamscore);//第三节客队比分
+		$szteamscore = intval($req->szteamscore);//第三节主队比分
+		$akteamscore = intval($req->akteamscore);//第四节客队比分
+		$azteamscore = intval($req->azteamscore);//第四节主队比分
 
-		$newapp = new \App\Models\Stlqresult();
-		$alldata = $newapp->onlyselect($match_id);
-		
-		if($only==1 || $only==2){
-			$ret = \App\Models\Stlqresult::updateOrCreate(['match_id'=>$match_id,'match_process'=>1],array_merge($alldata,['home_score'=>intval($ozteamscore),'guest_score'=>intval($okteamscore),'update_time'=>date('Y-m-d H:i:s'),'match_process'=>1]));
-		}
-		if($only==3 || $only==4){
-			$ret = \App\Models\Stlqresult::updateOrCreate(['match_id'=>$match_id,'match_process'=>2],array_merge($alldata,['home_score'=>intval($tzteamscore),'guest_score'=>intval($tkteamscore),'update_time'=>date('Y-m-d H:i:s'),'match_process'=>2]));
-		}
-		if($only==5 || $only==6){
-			$ret = \App\Models\Stlqresult::updateOrCreate(['match_id'=>$match_id,'match_process'=>3],array_merge($alldata,['home_score'=>intval($szteamscore),'guest_score'=>intval($skteamscore),'update_time'=>date('Y-m-d H:i:s'),'match_process'=>3]));
+		$model = \App\Models\Stlqresult::where('match_id', $match_id)->first();
+		$model->update_time = date('Y-m-d H:i:s');
+		$model->match_process = 1;
+			
+		if($only==1 || $only==3 || $only==5 || $only==7){
+			$guestscore =array(
+				'1' => $okteamscore,
+				'2' => $tkteamscore,
+				'3' => $skteamscore,
+				'4' => $akteamscore,
+			);
+			$model->guest_score = json_encode($guestscore);
 		}
-		if($only==7 || $only==8){
-			$ret = \App\Models\Stlqresult::updateOrCreate(['match_id'=>$match_id,'match_process'=>4],array_merge($alldata,['home_score'=>intval($azteamscore),'guest_score'=>intval($akteamscore),'update_time'=>date('Y-m-d H:i:s'),'match_process'=>4]));
+		if($only==2 || $only==4 || $only==6 || $only==8){
+			$homescore =array(
+				'1' => $ozteamscore,
+				'2' => $tzteamscore,
+				'3' => $szteamscore,
+				'4' => $azteamscore,
+			);
+			$model->home_score = json_encode($homescore);
 		}
+		$model->save();
 
 		$addnew = new \App\Models\Comendnotice();
 		$addnew->addcomendnotice($match_id,'lq');
 
 		$twoapp = new \App\Models\SportsBasket();
 		$twoapp->updatestatus('match_id',$match_id,['status'=>2]);//修改赛事状态
+		$newapp = new \App\Models\Stlqresult();
 		$newapp->updatestatus('match_id',$match_id,['status'=>2]);//修改结果状态
 
 		return responseToJson(1); 

app/Models/Stlqresult.php

@@ -11,13 +11,12 @@ class Stlqresult extends BaseModel
     function resultbklist($list = 10, $page, $where = '', $orwhere = '')
     {
         if (is_array ($where) && count ($where) > 0) { 
-            $data = $this->join('st_lq_league','st_lq_result.lg_id','=','st_lq_league.id')->select($this->table.'.id',$this->table.'.lg_id',$this->table.'.home_team',$this->table.'.guest_team',$this->table.'.home_rate',$this->table.'.guest_rate',$this->table.'.home_score',$this->table.'.guest_score',$this->table.'.all_goal',$this->table.'.status',$this->table.'.first_score',$this->table.'.last_score',$this->table.'.match_score',$this->table.'.match_winer',$this->table.'.update_time',$this->table.'.match_time',$this->table.'.match_process',$this->table.'.tag',$this->table.'.match_id',$this->table.'.u_home_score',$this->table.'.u_guest_score','st_lq_league.name_chinese')->orderby($this->table.'.id','desc')->where($where)->orwhere($orwhere)->paginate ($list); 
+            $data = $this->join('st_lq_league','st_lq_result.lg_id','=','st_lq_league.id')->join('st_lq_competition','st_lq_competition.id','=','st_lq_result.match_id')->select($this->table.'.id',$this->table.'.lg_id',$this->table.'.home_team',$this->table.'.guest_team',$this->table.'.home_rate',$this->table.'.guest_rate',$this->table.'.home_score',$this->table.'.guest_score',$this->table.'.all_goal',$this->table.'.status',$this->table.'.first_score',$this->table.'.last_score',$this->table.'.match_score',$this->table.'.match_winer',$this->table.'.update_time',$this->table.'.match_time',$this->table.'.match_process',$this->table.'.tag',$this->table.'.match_id',$this->table.'.u_home_score',$this->table.'.start_time',$this->table.'.u_guest_score','st_lq_league.name_chinese')->orderby($this->table.'.id','desc')->where($where)->orwhere($orwhere)->paginate ($list); 
         } else {
-            $data = $this->join('st_lq_league','st_lq_result.lg_id','=','st_lq_league.id')->select($this->table.'.id',$this->table.'.lg_id',$this->table.'.home_team',$this->table.'.guest_team',$this->table.'.home_rate',$this->table.'.guest_rate',$this->table.'.home_score',$this->table.'.guest_score',$this->table.'.all_goal',$this->table.'.status',$this->table.'.first_score',$this->table.'.last_score',$this->table.'.match_score',$this->table.'.match_winer',$this->table.'.update_time',$this->table.'.match_time',$this->table.'.match_process',$this->table.'.tag',$this->table.'.match_id',$this->table.'.u_home_score',$this->table.'.u_guest_score','st_lq_league.name_chinese')->orderby($this->table.'.id','desc')->paginate ($list); 
+            $data = $this->join('st_lq_league','st_lq_result.lg_id','=','st_lq_league.id')->join('st_lq_competition','st_lq_competition.id','=','st_lq_result.match_id')->select($this->table.'.id',$this->table.'.lg_id',$this->table.'.home_team',$this->table.'.guest_team',$this->table.'.home_rate',$this->table.'.guest_rate',$this->table.'.home_score',$this->table.'.guest_score',$this->table.'.all_goal',$this->table.'.status',$this->table.'.first_score',$this->table.'.last_score',$this->table.'.match_score',$this->table.'.match_winer',$this->table.'.update_time',$this->table.'.match_time',$this->table.'.match_process',$this->table.'.tag',$this->table.'.match_id',$this->table.'.u_home_score',$this->table.'.start_time',$this->table.'.u_guest_score','st_lq_league.name_chinese')->orderby($this->table.'.id','desc')->paginate ($list); 
         }
 
         return $data->toArray ();
-
 	}
 
     //根据match_id查询比赛1-4节比分

resources/lang/zh-cn/sportsbk.php

@@ -46,6 +46,6 @@ return array(
 	'firsthalf' => '上半场',
 	'fullcourt' => '全场', 
 	'operation' => '操作',
-	
+	'start_time' => '时间',
 	
 );

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

@@ -130,6 +130,10 @@
       @{{#} }}
     </script>
 
+    <script type="text/html" id="dsnum">
+        <span><a href="/admin/SoccerNoteList/notelist?type=lq&match_id=@{{d.match_id}}"> 单式</a></span>
+    </script>
+
     <script type="text/html" id="matchstatus">
       @{{#if(d.status==0){ }}
         <span>未开始</span>

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

@@ -117,7 +117,7 @@
     </script>
 
     <script type="text/html" id="dsnum">
-        <span><a href="/admin/SoccerNoteList/notelist?match_id=@{{d.match_id}}"> 单式</a></span>
+        <span><a href="/admin/SoccerNoteList/notelist?type=zq&match_id=@{{d.match_id}}"> 单式</a></span>
     </script>
 
     <script type="text/html" id="status">