From 30f1a12ec84fb010542e11c1f01b2b5010eb77a6 Mon Sep 17 00:00:00 2001 From: Dai Date: Mon, 21 Oct 2024 22:19:11 +0800 Subject: [PATCH] =?UTF-8?q?fix=20=E5=90=8E=E5=8F=B0=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E5=AD=A6=E7=94=9F=E6=9D=83=E9=99=90=EF=BC=8C=E8=A7=A3=E5=86=B3?= =?UTF-8?q?=E5=85=B6=E5=AE=83bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/common/service/StudentHomeworkService.php | 10 ++- app/common/service/StudentService.php | 2 +- .../app/controller/StudentController.php | 6 ++ .../TeacherScheduleTimeController.php | 2 +- plugin/admin/app/view/student/index.html | 16 ++++ plugin/admin/app/view/student/update.html | 75 +++++++++++++++---- 6 files changed, 90 insertions(+), 21 deletions(-) diff --git a/app/common/service/StudentHomeworkService.php b/app/common/service/StudentHomeworkService.php index 4053f61..ff40adc 100644 --- a/app/common/service/StudentHomeworkService.php +++ b/app/common/service/StudentHomeworkService.php @@ -159,16 +159,18 @@ class StudentHomeworkService //未提交作业的课程 $model = StudentSchedule::order('id desc')->where('id', 'not in', function ($query) use ($student) { $query->table('wa_student_homework')->where('student_id', $student->id)->field('teacher_schedule_time_id'); - }); + })->where('student_id', $student->id); $total = $model->count(); $list = $model->with(['student', 'subject', 'teacher'])->page($page, $limit) ->select(); } else { - $model = StudentSchedule::order('ss.id desc')->alias('ss') - ->leftJoin('student_homework sh', 'ss.teacher_schedule_time_id = sh.teacher_schedule_time_id') - ->where(['ss.student_id' => $student->id]); + $model = StudentSchedule::order('id desc') + ->where(['student_id' => $student->id]) + ->where('id', 'in', function ($query) use ($student) { + $query->table('wa_student_homework')->where('student_id', $student->id)->field('teacher_schedule_time_id'); + }); $total = $model->count(); $list = $model->with(['student', 'subject', 'teacher']) ->page($page, $limit) diff --git a/app/common/service/StudentService.php b/app/common/service/StudentService.php index 68aba97..8241ab4 100644 --- a/app/common/service/StudentService.php +++ b/app/common/service/StudentService.php @@ -143,7 +143,7 @@ class StudentService throw new Exception('请登陆后再查看'); } if (!empty((array)$request->student)) { - $student = Student::where(['id' => $request->student->id])->with(['parentArr'])->field('id,student_name,account,openid,avatar,nickname,parent_id')->findOrEmpty(); + $student = Student::where(['id' => $request->student->id])->with(['parentArr'])->field('id,student_name,account,openid,avatar,nickname,parent_id,show_schedule,show_homework,show_feedback')->findOrEmpty(); if ($student->isEmpty()) { throw new Exception('未找到学生信息'); } diff --git a/plugin/admin/app/controller/StudentController.php b/plugin/admin/app/controller/StudentController.php index 2ca6cf8..6a52d06 100644 --- a/plugin/admin/app/controller/StudentController.php +++ b/plugin/admin/app/controller/StudentController.php @@ -147,6 +147,9 @@ class StudentController extends Crud 'account' => $request_data['account'], 'avatar' => $request_data['avatar'], 'parent_id' => $request_data['parent_id'], + 'show_schedule' => isset($request_data['show_schedule']) ? $request_data['show_schedule'] : 0, + 'show_homework' => isset($request_data['show_homework']) ? $request_data['show_homework'] : 0, + 'show_feedback' => isset($request_data['show_feedback']) ? $request_data['show_feedback'] : 0, ]; } else { $salt = random_str(16); @@ -158,6 +161,9 @@ class StudentController extends Crud 'salt' => $salt, 'avatar' => $request_data['avatar'], 'parent_id' => $request_data['parent_id'], + 'show_schedule' => isset($request_data['show_schedule']) ? $request_data['show_schedule'] : 0, + 'show_homework' => isset($request_data['show_homework']) ? $request_data['show_homework'] : 0, + 'show_feedback' => isset($request_data['show_feedback']) ? $request_data['show_feedback'] : 0, ]; } diff --git a/plugin/admin/app/controller/TeacherScheduleTimeController.php b/plugin/admin/app/controller/TeacherScheduleTimeController.php index 1f375e7..fac5707 100644 --- a/plugin/admin/app/controller/TeacherScheduleTimeController.php +++ b/plugin/admin/app/controller/TeacherScheduleTimeController.php @@ -188,7 +188,7 @@ class TeacherScheduleTimeController extends Crud if (!is_time_cross($cross_data_time)) { throw new Exception('请确认时间是否有重叠'); } - + if (isset($data['teacher_schedule_id'])) { $teacher_schedule_id = array_filter($data['teacher_schedule_id']); diff --git a/plugin/admin/app/view/student/index.html b/plugin/admin/app/view/student/index.html index 721db6f..8cf70f2 100644 --- a/plugin/admin/app/view/student/index.html +++ b/plugin/admin/app/view/student/index.html @@ -79,6 +79,7 @@