|
@@ -44,6 +44,7 @@ class Screen extends Api |
|
@@ -44,6 +44,7 @@ class Screen extends Api |
|
44
|
->paginate(4)
|
44
|
->paginate(4)
|
|
45
|
->each(function ($item,$key){
|
45
|
->each(function ($item,$key){
|
|
46
|
$res = db('study_score_log')->where('campus_id',$item['campus_id'])->sum('score');
|
46
|
$res = db('study_score_log')->where('campus_id',$item['campus_id'])->sum('score');
|
|
|
|
47
|
+ $item['team_name'] = db('team')->where('id',$item['team_id'])->value('title');
|
|
47
|
$item['score'] = floor($item['sum_score']);
|
48
|
$item['score'] = floor($item['sum_score']);
|
|
48
|
$item['percent'] = round(($item['score']*0.6) / $res * 100,2);
|
49
|
$item['percent'] = round(($item['score']*0.6) / $res * 100,2);
|
|
49
|
$item['study'] = db('study_score_log l')
|
50
|
$item['study'] = db('study_score_log l')
|
