From 2bb18252089c5beb4439ec4e095fff82d56ef00d Mon Sep 17 00:00:00 2001 From: Dai Date: Tue, 13 Aug 2024 15:30:15 +0800 Subject: [PATCH 1/5] fix bug --- .../admin/app/controller/TeacherScheduleTimeController.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/plugin/admin/app/controller/TeacherScheduleTimeController.php b/plugin/admin/app/controller/TeacherScheduleTimeController.php index 2b22f80..7e33b31 100644 --- a/plugin/admin/app/controller/TeacherScheduleTimeController.php +++ b/plugin/admin/app/controller/TeacherScheduleTimeController.php @@ -511,12 +511,12 @@ class TeacherScheduleTimeController extends Crud mkdir($save_path, 0777, true); } $writer->save($save_path . $file_name); - +s return json([ 'code' => ResponseCode::WEB_API_SUCCESS, 'data' => [ -// 'url' => getenv('SERVER_DOMAIN') . $file_path, - 'file_url' => 'http://course.test' . $file_path . $file_name, + 'url' => getenv('SERVER_DOMAIN') . $file_path . $file_name, +// 'file_url' => 'http://course.test' . $file_path . $file_name, 'file_name' => $file_name ], 'msg' => 'success' From 3054ed4ba6a223de3ebceb02974562493c8e4792 Mon Sep 17 00:00:00 2001 From: Dai Date: Tue, 13 Aug 2024 15:30:56 +0800 Subject: [PATCH 2/5] fix bug --- plugin/admin/app/controller/TeacherScheduleTimeController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugin/admin/app/controller/TeacherScheduleTimeController.php b/plugin/admin/app/controller/TeacherScheduleTimeController.php index 7e33b31..506c048 100644 --- a/plugin/admin/app/controller/TeacherScheduleTimeController.php +++ b/plugin/admin/app/controller/TeacherScheduleTimeController.php @@ -511,7 +511,7 @@ class TeacherScheduleTimeController extends Crud mkdir($save_path, 0777, true); } $writer->save($save_path . $file_name); -s + return json([ 'code' => ResponseCode::WEB_API_SUCCESS, 'data' => [ From aa61d582641de90e88677e50b170819fbc072e93 Mon Sep 17 00:00:00 2001 From: Dai Date: Tue, 13 Aug 2024 15:34:04 +0800 Subject: [PATCH 3/5] fix bug --- plugin/admin/app/controller/TeacherScheduleTimeController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugin/admin/app/controller/TeacherScheduleTimeController.php b/plugin/admin/app/controller/TeacherScheduleTimeController.php index 506c048..329980e 100644 --- a/plugin/admin/app/controller/TeacherScheduleTimeController.php +++ b/plugin/admin/app/controller/TeacherScheduleTimeController.php @@ -515,7 +515,7 @@ class TeacherScheduleTimeController extends Crud return json([ 'code' => ResponseCode::WEB_API_SUCCESS, 'data' => [ - 'url' => getenv('SERVER_DOMAIN') . $file_path . $file_name, + 'file_url' => getenv('SERVER_DOMAIN') . $file_path . $file_name, // 'file_url' => 'http://course.test' . $file_path . $file_name, 'file_name' => $file_name ], From fc085efef89eb4336a44ba35522168eca60ffdcd Mon Sep 17 00:00:00 2001 From: Dai Date: Wed, 14 Aug 2024 14:13:11 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E6=95=99=E5=B8=88=E6=8E=92=E8=AF=BE?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E6=B7=BB=E5=8A=A0=E8=BF=94=E5=9B=9E=E5=80=BC?= =?UTF-8?q?has=5Fhomework?= 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 +} From 8dd3ab6a9d83b1be56de9cb67b135814d4b9147b Mon Sep 17 00:00:00 2001 From: Dai Date: Wed, 14 Aug 2024 14:16:38 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E6=95=99=E5=B8=88=E8=AF=BE=E7=A8=8B?= =?UTF-8?q?=E5=AE=89=E6=8E=92=E6=B7=BB=E5=8A=A0=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/common/service/TeacherScheduleTimeService.php | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/app/common/service/TeacherScheduleTimeService.php b/app/common/service/TeacherScheduleTimeService.php index 79b2685..79a6f2d 100644 --- a/app/common/service/TeacherScheduleTimeService.php +++ b/app/common/service/TeacherScheduleTimeService.php @@ -121,7 +121,14 @@ class TeacherScheduleTimeService } } if($item['studentHomework']){ - $item['has_homework'] = 1; + $item['has_homework'] = 0; + foreach ($item['studentHomework'] as $index => $value) { + if($value['is_publish']){ + $item['has_homework'] = 1; + }else{ + unset($item['studentHomework'][$index]); + } + } }else{ $item['has_homework'] = 0; }