From f1eb58eb1bffcf4c5f13eb1daabcd08fa30ab80c Mon Sep 17 00:00:00 2001
From: Dai <risin9@foxmail.com>
Date: Wed, 24 Jul 2024 15:09:09 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AD=A6=E7=94=9F=E6=8E=92=E8=AF=BE=E6=97=B6?=
 =?UTF-8?q?=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/TeacherScheduleTimeService.php    | 31 +++++++++++++------
 .../controller/StudentScheduleController.php  |  4 ++-
 2 files changed, 24 insertions(+), 11 deletions(-)

diff --git a/app/common/service/TeacherScheduleTimeService.php b/app/common/service/TeacherScheduleTimeService.php
index 2c32480..183a9e1 100644
--- a/app/common/service/TeacherScheduleTimeService.php
+++ b/app/common/service/TeacherScheduleTimeService.php
@@ -99,17 +99,28 @@ class TeacherScheduleTimeService
             if (isset($data['date']) && !empty($data['date'])) {
                 $schedule->where('date', $data['date']);
             }
-            
-            $list = $schedule->field('id,teacher_id,date,time,hour,month,subject_id,is_publish')
-                ->with(['subject'])
-                ->select();
 
-//            foreach ($schedule as &$item){
-//                if(!$item->is_publish){
-//                    $item->subject_name = '';
-//                    $item->english_name = '';
-//                }
-//            }
+            $list = $schedule->field('id,teacher_id,date,time,hour,month,subject_id,is_publish')
+                ->with(['subject', 'studentSchedule', 'teacher'])
+                ->select()->toArray();
+
+            foreach ($list as $key => &$item) {
+                if ($item['studentSchedule']) {
+                    foreach ($item['studentSchedule'] as $index => $value) {
+                        if(!$value['is_publish']){
+                            unset($item['studentSchedule'][$index]);
+                        }else{
+                            unset($item['studentSchedule'][$index]['deleted_at']);
+                            unset($item['studentSchedule'][$index]['updated_at']);
+                            unset($item['studentSchedule'][$index]['created_at']);
+                            unset($item['studentSchedule'][$index]['month']);
+                            unset($item['studentSchedule'][$index]['teacher_schedule_time_detail']);
+                            unset($item['studentSchedule'][$index]['end_time']);
+                            unset($item['studentSchedule'][$index]['start_time']);
+                        }
+                    }
+                }
+            }
 
             return [
                 'code' => ResponseCode::SUCCESS,
diff --git a/plugin/admin/app/controller/StudentScheduleController.php b/plugin/admin/app/controller/StudentScheduleController.php
index cccdfa5..8a2b97e 100644
--- a/plugin/admin/app/controller/StudentScheduleController.php
+++ b/plugin/admin/app/controller/StudentScheduleController.php
@@ -84,7 +84,7 @@ class StudentScheduleController extends Crud
             $page = $page > 0 ? $page : 1;
 
             $total = $student_schedule->count();
-            $list = $student_schedule->with(['teacher', 'student', 'subject'])->page($page, $limit)->select();
+            $list = $student_schedule->with(['teacher', 'subject'])->page($page, $limit)->select();
 
             return json([
                 'code' => ResponseCode::WEB_API_SUCCESS,
@@ -190,8 +190,10 @@ class StudentScheduleController extends Crud
                     throw new Exception("该学生课程和【{$conflict->teacher_name}】的【{$conflict->subject_name} {$conflict->date} {$conflict->time} 】有冲突");
                 }
 
+                $student = Student::where(['id'=>$data['student_id']])->findOrEmpty();
                 $res = \app\common\model\StudentSchedule::create([
                     'student_id' => $data['student_id'],
+                    'student_name' => $student->student_name,
                     'teacher_schedule_time_id' => $teacher_schedule_time->id,
                     'teacher_schedule_time_detail' => '',
                     'teacher_id' => $teacher_schedule_time->teacher_id,