fix 导出教师排课数据
This commit is contained in:
parent
7b97647c7e
commit
fcb7b3c847
@ -572,7 +572,7 @@ class TeacherScheduleTimeController extends Crud
|
|||||||
$is_publish = $request->get('is_publish');
|
$is_publish = $request->get('is_publish');
|
||||||
|
|
||||||
|
|
||||||
$summary = \app\common\model\TeacherScheduleTime::order('ts.start_time asc')->alias('ts')
|
$query = \app\common\model\TeacherScheduleTime::order('ts.start_time asc')->alias('ts')
|
||||||
->leftJoin('teacher t', 'ts.teacher_id = t.id')
|
->leftJoin('teacher t', 'ts.teacher_id = t.id')
|
||||||
->leftJoin('student_schedule ss', 'ts.id = ss.teacher_schedule_time_id and t.id = ss.teacher_id')
|
->leftJoin('student_schedule ss', 'ts.id = ss.teacher_schedule_time_id and t.id = ss.teacher_id')
|
||||||
->leftJoin('subject sb', 'ts.subject_id = sb.id')
|
->leftJoin('subject sb', 'ts.subject_id = sb.id')
|
||||||
@ -592,9 +592,10 @@ class TeacherScheduleTimeController extends Crud
|
|||||||
')
|
')
|
||||||
->group('ts.id');
|
->group('ts.id');
|
||||||
if($request->get('teacher_id')){
|
if($request->get('teacher_id')){
|
||||||
$summary->where('ts.teacher_id', $request->get('teacher_id'));
|
$query->where('ts.teacher_id', $request->get('teacher_id'));
|
||||||
}
|
}
|
||||||
$summary->select()->toArray();
|
$summary = $query->select()->toArray();
|
||||||
|
|
||||||
|
|
||||||
$export_data = [];
|
$export_data = [];
|
||||||
foreach ($summary as $item) {
|
foreach ($summary as $item) {
|
||||||
|
Loading…
x
Reference in New Issue
Block a user