教师端接口添加本地时间、中国时间字段,教师排课添加时区信息
This commit is contained in:
parent
f5c7092f1a
commit
d2942f4bd2
@ -24,8 +24,6 @@ class TeacherScheduleTime extends BaseModel
|
||||
return $this->hasOne(Teacher::class, 'id', 'teacher_id')->bind([
|
||||
'teacher_account' => 'account',
|
||||
'teacher_name',
|
||||
'time_zone_name',
|
||||
'time_zone_offset'
|
||||
]);
|
||||
}
|
||||
|
||||
|
@ -100,7 +100,7 @@ class TeacherScheduleTimeService
|
||||
$schedule->where('date', $data['date']);
|
||||
}
|
||||
|
||||
$list = $schedule->field('id,teacher_id,date,time,en_time,hour,month,subject_id,is_publish')
|
||||
$list = $schedule->field('id,teacher_id,date,en_date,time,en_time,hour,month,en_month,time_zone_id,time_zone_name,time_zone_abbr,time_zone_offset,subject_id,is_publish')
|
||||
->with(['subject', 'studentSchedule', 'teacher', 'studentHomework'])
|
||||
->select()->toArray();
|
||||
|
||||
|
@ -238,6 +238,11 @@ class TeacherScheduleTimeController extends Crud
|
||||
'en_end_time' => $en_end_time,
|
||||
'month' => $free_time->month,
|
||||
'en_month' => $free_time->en_month,
|
||||
'time_zone_id' => $free_time->time_zone_id,
|
||||
'time_zone_abbr' => $free_time->time_zone_abbr,
|
||||
'time_zone_name' => $free_time->time_zone_name,
|
||||
'time_zone_offset' => $free_time->time_zone_offset,
|
||||
'en_month' => $free_time->en_month,
|
||||
'subject_id' => $data['subject_id'][$index],
|
||||
'free_time_id' => $free_time->id,
|
||||
]);
|
||||
@ -255,6 +260,11 @@ class TeacherScheduleTimeController extends Crud
|
||||
'en_end_time' => $en_end_time,
|
||||
'month' => $free_time->month,
|
||||
'en_month' => $free_time->en_month,
|
||||
'en_month' => $free_time->en_month,
|
||||
'time_zone_id' => $free_time->time_zone_id,
|
||||
'time_zone_abbr' => $free_time->time_zone_abbr,
|
||||
'time_zone_name' => $free_time->time_zone_name,
|
||||
'time_zone_offset' => $free_time->time_zone_offset,
|
||||
'subject_id' => $data['subject_id'][$index],
|
||||
'free_time_id' => $free_time->id,
|
||||
]);
|
||||
|
Loading…
x
Reference in New Issue
Block a user