diff --git a/app/common/service/TeacherFreeTimeService.php b/app/common/service/TeacherFreeTimeService.php index a934d8a..72505c6 100644 --- a/app/common/service/TeacherFreeTimeService.php +++ b/app/common/service/TeacherFreeTimeService.php @@ -179,7 +179,7 @@ class TeacherFreeTimeService if (empty((array)$request->teacher)) { throw new Exception('请教师登陆后再设置'); } - + $free_time = TeacherFreeTime::where(['month' => $request->get('month'), 'teacher_id' => $request->teacher->id])->select(); return [ diff --git a/plugin/admin/app/controller/TeacherScheduleTimeController.php b/plugin/admin/app/controller/TeacherScheduleTimeController.php index a2d06a4..485e37e 100644 --- a/plugin/admin/app/controller/TeacherScheduleTimeController.php +++ b/plugin/admin/app/controller/TeacherScheduleTimeController.php @@ -495,7 +495,11 @@ class TeacherScheduleTimeController extends Crud */ public function exportScheduleIndex(Request $request) { - return view('teacher-schedule-time/export_schedule_index'); + + //获取所有老师 + $teacher = Teacher::order('id asc')->field('id,teacher_name,account')->select()->toArray(); + + return view('teacher-schedule-time/export_schedule_index', [ 'teacher' => $teacher]); } @@ -509,9 +513,13 @@ class TeacherScheduleTimeController extends Crud $summary = \app\common\model\TeacherScheduleTime::order('ts.month desc')->alias('ts') ->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'); + + if($request->get('teacher_id')){ + $summary->where('ts.teacher_id', $request->get('teacher_id')); + } // ->where(['ts.is_publish' => 1]) - ->field(' + $summary->field(' ts.month, COUNT(DISTINCT ts.teacher_id) AS teacher_count, @@ -562,6 +570,8 @@ class TeacherScheduleTimeController extends Crud try { $month = $request->get('month'); $is_publish = $request->get('is_publish'); + + $summary = \app\common\model\TeacherScheduleTime::order('ts.start_time asc')->alias('ts') ->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') @@ -580,8 +590,11 @@ class TeacherScheduleTimeController extends Crud sb.english_name, ss.student_name ') - ->group('ts.id') - ->select()->toArray(); + ->group('ts.id'); + if($request->get('teacher_id')){ + $summary->where('ts.teacher_id', $request->get('teacher_id')); + } + $summary->select()->toArray(); $export_data = []; foreach ($summary as $item) { @@ -595,7 +608,7 @@ class TeacherScheduleTimeController extends Crud $worksheet->setCellValue('A1', 'Week'); $worksheet->setCellValue('B1', 'Date'); $worksheet->setCellValue('C1', 'China TIme'); - $worksheet->setCellValue('D1', 'UK Time'); + $worksheet->setCellValue('D1', 'Local Time(Tutor)'); $worksheet->setCellValue('E1', 'Subject'); $worksheet->setCellValue('F1', 'Tutor'); $worksheet->setCellValue('G1', 'Student'); diff --git a/plugin/admin/app/view/teacher-schedule-time/export_schedule_index.html b/plugin/admin/app/view/teacher-schedule-time/export_schedule_index.html index 77ff43a..33ee6e4 100644 --- a/plugin/admin/app/view/teacher-schedule-time/export_schedule_index.html +++ b/plugin/admin/app/view/teacher-schedule-time/export_schedule_index.html @@ -9,6 +9,43 @@ + +
+
+
+ +
+ +
+ +
+
+ + + + +
+ + + +
+
+ 展开 + 收起 +
+
+
+
+
@@ -255,8 +292,9 @@ // 老师课程安排 let export_schedule = function(obj) { let month = obj.data['month']; + let teacher_id = layui.$('#teacher_id').val(); layui.$.ajax({ - url: '/app/admin/teacherScheduleTime/exportSummary?is_publish=1&month=' + month, + url: '/app/admin/teacherScheduleTime/exportSummary?is_publish=1&month=' + month +'&teacher_id=' + teacher_id, type: "POST", dateType: "json", success: function (res) {