From fc085efef89eb4336a44ba35522168eca60ffdcd Mon Sep 17 00:00:00 2001 From: Dai Date: Wed, 14 Aug 2024 14:13:11 +0800 Subject: [PATCH] =?UTF-8?q?=E6=95=99=E5=B8=88=E6=8E=92=E8=AF=BE=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E6=B7=BB=E5=8A=A0=E8=BF=94=E5=9B=9E=E5=80=BChas=5Fhom?= =?UTF-8?q?ework?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/common/model/TeacherScheduleTime.php | 5 +++++ app/common/service/TeacherScheduleTimeService.php | 9 +++++++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/app/common/model/TeacherScheduleTime.php b/app/common/model/TeacherScheduleTime.php index 0886ff4..f3c5c41 100644 --- a/app/common/model/TeacherScheduleTime.php +++ b/app/common/model/TeacherScheduleTime.php @@ -54,4 +54,9 @@ class TeacherScheduleTime extends BaseModel return $this->hasMany(StudentSchedule::class, 'teacher_schedule_time_id', 'id'); } + public function studentHomework() + { + return $this->hasMany(StudentHomework::class, 'teacher_schedule_time_id', 'id'); + } + } diff --git a/app/common/service/TeacherScheduleTimeService.php b/app/common/service/TeacherScheduleTimeService.php index bbce629..79b2685 100644 --- a/app/common/service/TeacherScheduleTimeService.php +++ b/app/common/service/TeacherScheduleTimeService.php @@ -101,7 +101,7 @@ class TeacherScheduleTimeService } $list = $schedule->field('id,teacher_id,date,time,en_time,hour,month,subject_id,is_publish') - ->with(['subject', 'studentSchedule', 'teacher']) + ->with(['subject', 'studentSchedule', 'teacher', 'studentHomework']) ->select()->toArray(); foreach ($list as $key => &$item) { @@ -120,6 +120,11 @@ class TeacherScheduleTimeService } } } + if($item['studentHomework']){ + $item['has_homework'] = 1; + }else{ + $item['has_homework'] = 0; + } } return [ @@ -136,4 +141,4 @@ class TeacherScheduleTimeService } -} \ No newline at end of file +}