fix bug
This commit is contained in:
parent
6c339d847a
commit
7b88f72965
@ -34,20 +34,44 @@ class SubjectHomeworkService
|
|||||||
throw new Exception('未找到教师课程安排');
|
throw new Exception('未找到教师课程安排');
|
||||||
}
|
}
|
||||||
|
|
||||||
// $subject_homework = SubjectHomework::where([
|
|
||||||
// 'teacher_id' => $teacher->id,
|
|
||||||
// 'teacher_schedule_time_id' => $data['teacher_schedule_time_id'],
|
|
||||||
// 'subject_id' => $teacher_schedule_time->subject_id
|
|
||||||
// ])->findOrEmpty();
|
|
||||||
//
|
|
||||||
// if (!$subject_homework->isEmpty()) {
|
|
||||||
// throw new Exception('家庭作业已存在,请勿重复提交');
|
|
||||||
// }
|
|
||||||
|
|
||||||
if (isset($data['subject_homework_id']) && !empty($data['subject_homework_id'])) {
|
if (isset($data['subject_homework_id']) && !empty($data['subject_homework_id'])) {
|
||||||
$subject_homework = SubjectHomework::where(['id' => $data['subject_homework_id']])->findOrEmpty();
|
$subject_homework = SubjectHomework::where(['id' => $data['subject_homework_id']])->findOrEmpty();
|
||||||
} else {
|
} else {
|
||||||
$subject_homework = new SubjectHomework();
|
$subject_homework = SubjectHomework::where([
|
||||||
|
'teacher_id' => $teacher->id,
|
||||||
|
'teacher_schedule_time_id' => $data['teacher_schedule_time_id'],
|
||||||
|
'subject_id' => $teacher_schedule_time->subject_id
|
||||||
|
])->findOrEmpty();
|
||||||
|
if($subject_homework->isEmpty()){
|
||||||
|
$subject_homework = new SubjectHomework();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
$homework_file_url = '';
|
||||||
|
if(isset($data['homework_file_url'])){
|
||||||
|
if(!empty(json_decode($data['homework_file_url'],true))){
|
||||||
|
$homework_file_url = $data['homework_file_url'];
|
||||||
|
}
|
||||||
|
}
|
||||||
|
$last_homework_feedback_url = '';
|
||||||
|
if(isset($data['last_homework_feedback_url'])){
|
||||||
|
if(!empty(json_decode($data['last_homework_feedback_url'],true))){
|
||||||
|
$last_homework_feedback_url = $data['last_homework_feedback_url'];
|
||||||
|
}
|
||||||
|
}
|
||||||
|
$subject_report_url = '';
|
||||||
|
if(isset($data['subject_report_url'])){
|
||||||
|
if(!empty(json_decode($data['subject_report_url'],true))){
|
||||||
|
$subject_report_url = $data['subject_report_url'];
|
||||||
|
}
|
||||||
|
}
|
||||||
|
$subject_file_url = '';
|
||||||
|
if(isset($data['subject_file_url'])){
|
||||||
|
if(!empty(json_decode($data['subject_file_url'],true))){
|
||||||
|
$subject_file_url = $data['subject_file_url'];
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
$res = $subject_homework->save([
|
$res = $subject_homework->save([
|
||||||
@ -60,14 +84,10 @@ class SubjectHomeworkService
|
|||||||
'month' => $teacher_schedule_time->month,
|
'month' => $teacher_schedule_time->month,
|
||||||
'subject_id' => $teacher_schedule_time->subject_id,
|
'subject_id' => $teacher_schedule_time->subject_id,
|
||||||
'homework_web_url' => isset($data['homework_web_url']) ? $data['homework_web_url'] : '',
|
'homework_web_url' => isset($data['homework_web_url']) ? $data['homework_web_url'] : '',
|
||||||
'homework_file_url' => isset($data['homework_file_url']) ? json_encode($data['homework_file_url'], JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES) : '',
|
'homework_file_url' => $homework_file_url,
|
||||||
// 'homework_file_name' => isset($data['homework_file_name']) ? json_encode($data['homework_file_name'], JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES) : '',
|
'last_homework_feedback_url' => $last_homework_feedback_url,
|
||||||
'last_homework_feedback_url' => isset($data['last_homework_feedback_url']) ? json_encode($data['last_homework_feedback_url'], JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES) : '',
|
'subject_report_url' => $subject_report_url,
|
||||||
// 'last_homework_feedback_name' => isset($data['last_homework_feedback_name']) ? json_encode($data['last_homework_feedback_name'], JSON_UNESCAPED_UNICODE, JSON_UNESCAPED_SLASHES) : '',
|
'subject_file_url' => $subject_file_url,
|
||||||
'subject_report_url' => isset($data['subject_report_url']) ? json_encode($data['subject_report_url'], JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES) : '',
|
|
||||||
// 'subject_report_name' => isset($data['subject_report_name']) ? $data['subject_report_name'] : '',
|
|
||||||
'subject_file_url' => isset($data['subject_file_url']) ? json_encode($data['subject_file_url'], JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES) : '',
|
|
||||||
// 'subject_file_name' => isset($data['subject_file_name']) ? $data['subject_file_name'] : '',
|
|
||||||
]);
|
]);
|
||||||
|
|
||||||
return [
|
return [
|
||||||
|
Loading…
x
Reference in New Issue
Block a user