|
@@ -36,12 +36,12 @@ class Screen extends Api |
|
@@ -36,12 +36,12 @@ class Screen extends Api |
|
36
|
$list['time'] = date('Y-m-d H:i:s',time());
|
36
|
$list['time'] = date('Y-m-d H:i:s',time());
|
|
37
|
$list['team_rank'] = \db('team_score')
|
37
|
$list['team_rank'] = \db('team_score')
|
|
38
|
->where('ronda_id',$data['ronda_id'])
|
38
|
->where('ronda_id',$data['ronda_id'])
|
|
39
|
- ->field('score as sum_score,team_id')
|
39
|
+// ->field('score as sum_score,team_id')
|
|
40
|
->order('score DESC')
|
40
|
->order('score DESC')
|
|
41
|
->paginate(4)
|
41
|
->paginate(4)
|
|
42
|
->each(function ($item,$key){
|
42
|
->each(function ($item,$key){
|
|
43
|
$item['team_name'] = db('team')->where('id',$item['team_id'])->value('title');
|
43
|
$item['team_name'] = db('team')->where('id',$item['team_id'])->value('title');
|
|
44
|
- $item['score'] = $item['sum_score'];
|
44
|
+ $item['team_score'] = $item['score'];
|
|
45
|
$item['study'] = db('study_ronda_score l')
|
45
|
$item['study'] = db('study_ronda_score l')
|
|
46
|
->join('study s','l.sid = s.id')
|
46
|
->join('study s','l.sid = s.id')
|
|
47
|
->where('l.team_id',$item['team_id'])
|
47
|
->where('l.team_id',$item['team_id'])
|
