|
@@ -213,12 +213,12 @@ class Index extends Api |
|
@@ -213,12 +213,12 @@ class Index extends Api |
|
213
|
$data = \db('study_score_log l')
|
213
|
$data = \db('study_score_log l')
|
|
214
|
->distinct('l.team')
|
214
|
->distinct('l.team')
|
|
215
|
->join('team t', 't.title = l.team')
|
215
|
->join('team t', 't.title = l.team')
|
|
216
|
- ->whereIn('l.campus_ids', $campus)
|
216
|
+ ->where('l.campus_id', $campus)
|
|
217
|
->field('t.title,t.score,l.team,l.campus_ids')
|
217
|
->field('t.title,t.score,l.team,l.campus_ids')
|
|
218
|
->order('t.score DESC')
|
218
|
->order('t.score DESC')
|
|
219
|
->paginate($row, false, ['page' => $page])
|
219
|
->paginate($row, false, ['page' => $page])
|
|
220
|
->each(function ($item, $key) {
|
220
|
->each(function ($item, $key) {
|
|
221
|
- $res = db('study_score_log')->where('campus_ids', $item['campus_ids'])->sum('score');
|
221
|
+ $res = db('study_score_log')->where('campus_id', $item['campus_ids'])->sum('score');
|
|
222
|
$item['score'] = floor($item['score']);
|
222
|
$item['score'] = floor($item['score']);
|
|
223
|
$item['percent'] = round(($item['score'] * 0.6) / $res * 100, 2);
|
223
|
$item['percent'] = round(($item['score'] * 0.6) / $res * 100, 2);
|
|
224
|
return $item;
|
224
|
return $item;
|
|
@@ -264,7 +264,7 @@ class Index extends Api |
|
@@ -264,7 +264,7 @@ class Index extends Api |
|
264
|
//个人排行榜
|
264
|
//个人排行榜
|
|
265
|
$data = \db('study_score_log')
|
265
|
$data = \db('study_score_log')
|
|
266
|
->field('id,SUM(score) as sum_score,study_id')
|
266
|
->field('id,SUM(score) as sum_score,study_id')
|
|
267
|
- ->whereIn('campus_ids', $campus)
|
267
|
+ ->where('campus_id', $campus)
|
|
268
|
->group('study_id')
|
268
|
->group('study_id')
|
|
269
|
->order('sum_score DESC')
|
269
|
->order('sum_score DESC')
|
|
270
|
->paginate($row, false, ['page' => $page])
|
270
|
->paginate($row, false, ['page' => $page])
|
