正在显示
1 个修改的文件
包含
6 行增加
和
8 行删除
@@ -37,13 +37,11 @@ class Screen extends Api | @@ -37,13 +37,11 @@ class Screen extends Api | ||
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 | ->order('score DESC') | 39 | ->order('score DESC') |
40 | - ->paginate(4); | ||
41 | -// ->each(function ($item,$key){ | ||
42 | -// $res = db('study_score_log')->whereIn('campus_ids',$item['campus_ids'])->sum('score'); | ||
43 | -// $item['team_name'] = db('team')->where('title',$item['team'])->value('title'); | ||
44 | -// $item['team_score'] = db('team')->where('title',$item['team'])->value('score'); | 40 | + ->paginate(4) |
41 | + ->each(function ($item,$key){ | ||
42 | + $item['team_name'] = db('team')->where('id',$item['team_id'])->value('title'); | ||
43 | + $item['team_score'] = $item['score']; | ||
45 | // $item['score'] = floor($item['sum_score']); | 44 | // $item['score'] = floor($item['sum_score']); |
46 | -// $item['percent'] = round(($item['score']*0.6) / $res * 100,2); | ||
47 | // $item['study'] = db('study_score_log l') | 45 | // $item['study'] = db('study_score_log l') |
48 | // ->distinct('l.study_id') | 46 | // ->distinct('l.study_id') |
49 | // ->join('study s','l.study_id = s.id') | 47 | // ->join('study s','l.study_id = s.id') |
@@ -53,8 +51,8 @@ class Screen extends Api | @@ -53,8 +51,8 @@ class Screen extends Api | ||
53 | // ->order('sum_score','desc') | 51 | // ->order('sum_score','desc') |
54 | // ->group('study_id') | 52 | // ->group('study_id') |
55 | // ->select(); | 53 | // ->select(); |
56 | -// return $item; | ||
57 | -// }); | 54 | + return $item; |
55 | + }); | ||
58 | $this->success('获取成功',$list); | 56 | $this->success('获取成功',$list); |
59 | } | 57 | } |
60 | 58 |
-
请 注册 或 登录 后发表评论