admin/course
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

学生排课时间

Browse Source
This commit is contained in:
Dai 2024-07-24 15:09:09 +08:00
parent 6c7f894636
commit f1eb58eb1b
2 changed files with 24 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
app/common/service/TeacherScheduleTimeService.php
View File

@ -101,15 +101,26 @@ class TeacherScheduleTimeService
}
$list = $schedule->field('id,teacher_id,date,time,hour,month,subject_id,is_publish')
->with(['subject'])
->select();
->with(['subject', 'studentSchedule', 'teacher'])
->select()->toArray();
// foreach ($schedule as &$item){
// if(!$item->is_publish){
// $item->subject_name = '';
// $item->english_name = '';
// }
// }
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,

4
plugin/admin/app/controller/StudentScheduleController.php
View File

@ -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,