|
@@ -54,7 +54,7 @@ class Screen extends Api |
|
@@ -54,7 +54,7 @@ class Screen extends Api |
54
|
->each(function ($item,$key){
|
54
|
->each(function ($item,$key){
|
55
|
$res = db('study_score_log')->where('campus_id',$item['campus_id'])->sum('score');
|
55
|
$res = db('study_score_log')->where('campus_id',$item['campus_id'])->sum('score');
|
56
|
$item['score'] = floor($item['sum_score']);
|
56
|
$item['score'] = floor($item['sum_score']);
|
57
|
- $item['percent'] = round($item['score'] / $res * 100,2);
|
57
|
+ $item['percent'] = round(($item['score']*0.6) / $res * 100,2);
|
58
|
$item['study'] = db('study')->where('team_id',$item['team_id'])->field('name,earn_score')->order('earn_score','desc')->select();
|
58
|
$item['study'] = db('study')->where('team_id',$item['team_id'])->field('name,earn_score')->order('earn_score','desc')->select();
|
59
|
return $item;
|
59
|
return $item;
|
60
|
});
|
60
|
});
|