|
@@ -83,7 +83,7 @@ class Item extends Backend |
|
@@ -83,7 +83,7 @@ class Item extends Backend |
|
83
|
$res = db('study_score_log l')
|
83
|
$res = db('study_score_log l')
|
|
84
|
->join('study s', 's.id = l.study_id')
|
84
|
->join('study s', 's.id = l.study_id')
|
|
85
|
->where('item_id', $data['id'])
|
85
|
->where('item_id', $data['id'])
|
|
86
|
- ->field('l.study_id,sum(l.score) as sum_score,s.name,s.sno,s.team_id')
|
86
|
+ ->field('l.study_id,sum(l.score) as sum_score,s.name,s.sno,s.team_id,s.school_id,s.grade_id')
|
|
87
|
->group('l.study_id')
|
87
|
->group('l.study_id')
|
|
88
|
->order('sum_score', 'desc')
|
88
|
->order('sum_score', 'desc')
|
|
89
|
->select();
|
89
|
->select();
|
|
@@ -93,6 +93,8 @@ class Item extends Backend |
|
@@ -93,6 +93,8 @@ class Item extends Backend |
|
93
|
'name' => $v['name'],
|
93
|
'name' => $v['name'],
|
|
94
|
'sno' => $v['sno'],
|
94
|
'sno' => $v['sno'],
|
|
95
|
'title' => db('team')->where('id',$v['team_id'])->value('title'),
|
95
|
'title' => db('team')->where('id',$v['team_id'])->value('title'),
|
|
|
|
96
|
+ 'school' => db('school')->where('id',$v['school_id'])->value('title'),
|
|
|
|
97
|
+ 'grade' => db('grade')->where('id',$v['grade_id'])->value('name'),
|
|
96
|
'score' => $v['sum_score']
|
98
|
'score' => $v['sum_score']
|
|
97
|
];
|
99
|
];
|
|
98
|
}
|
100
|
}
|
