课程作业
This commit is contained in:
parent
ce0873417d
commit
7d2507bd1a
@ -34,17 +34,23 @@ class SubjectHomeworkService
|
|||||||
throw new Exception('未找到教师课程安排');
|
throw new Exception('未找到教师课程安排');
|
||||||
}
|
}
|
||||||
|
|
||||||
$subject_homework = SubjectHomework::where([
|
// $subject_homework = SubjectHomework::where([
|
||||||
'teacher_id' => $teacher->id,
|
// 'teacher_id' => $teacher->id,
|
||||||
'teacher_schedule_time_id' => $data['teacher_schedule_time_id'],
|
// 'teacher_schedule_time_id' => $data['teacher_schedule_time_id'],
|
||||||
'subject_id' => $teacher_schedule_time->subject_id
|
// 'subject_id' => $teacher_schedule_time->subject_id
|
||||||
])->findOrEmpty();
|
// ])->findOrEmpty();
|
||||||
|
//
|
||||||
|
// if (!$subject_homework->isEmpty()) {
|
||||||
|
// throw new Exception('家庭作业已存在,请勿重复提交');
|
||||||
|
// }
|
||||||
|
|
||||||
if (!$subject_homework->isEmpty()) {
|
if (isset($data['subject_homework_id']) && !empty($data['subject_homework_id'])) {
|
||||||
throw new Exception('家庭作业已存在,请勿重复提交');
|
$subject_homework = SubjectHomework::where(['id' => $data['subject_homework_id']])->findOrEmpty();
|
||||||
|
} else {
|
||||||
|
$subject_homework = new SubjectHomework();
|
||||||
}
|
}
|
||||||
|
|
||||||
$res = SubjectHomework::create([
|
$res = $subject_homework->save([
|
||||||
'teacher_id' => $teacher->id,
|
'teacher_id' => $teacher->id,
|
||||||
'teacher_schedule_time_id' => $data['teacher_schedule_time_id'],
|
'teacher_schedule_time_id' => $data['teacher_schedule_time_id'],
|
||||||
'date' => $teacher_schedule_time->date,
|
'date' => $teacher_schedule_time->date,
|
||||||
@ -54,14 +60,14 @@ 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']) ? $data['homework_file_url'] : '',
|
'homework_file_url' => isset($data['homework_file_url']) ? json_encode($data['homework_file_url'], JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES) : '',
|
||||||
'homework_file_name' => isset($data['homework_file_name'])? $data['homework_file_name'] : '',
|
// 'homework_file_name' => isset($data['homework_file_name']) ? json_encode($data['homework_file_name'], JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES) : '',
|
||||||
'last_homework_feedback_url' => isset($data['last_homework_feedback_url']) ? $data['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) : '',
|
||||||
'last_homework_feedback_name' => isset($data['last_homework_feedback_name']) ? $data['last_homework_feedback_name'] : '',
|
// 'last_homework_feedback_name' => isset($data['last_homework_feedback_name']) ? json_encode($data['last_homework_feedback_name'], JSON_UNESCAPED_UNICODE, JSON_UNESCAPED_SLASHES) : '',
|
||||||
'subject_report_url' => isset($data['subject_report_url']) ? $data['subject_report_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_report_name' => isset($data['subject_report_name']) ? $data['subject_report_name'] : '',
|
||||||
'subject_file_url' => isset($data['subject_file_url']) ? $data['subject_file_url'] : '',
|
'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'] : '',
|
// 'subject_file_name' => isset($data['subject_file_name']) ? $data['subject_file_name'] : '',
|
||||||
]);
|
]);
|
||||||
|
|
||||||
return [
|
return [
|
||||||
@ -139,14 +145,14 @@ class SubjectHomeworkService
|
|||||||
{
|
{
|
||||||
try {
|
try {
|
||||||
$data = $request->post();
|
$data = $request->post();
|
||||||
$subject_homework = SubjectHomework::where(['id'=>$data['subject_homework_id']])->findOrEmpty();
|
$subject_homework = SubjectHomework::where(['id' => $data['subject_homework_id']])->findOrEmpty();
|
||||||
if($subject_homework->isEmpty()){
|
if ($subject_homework->isEmpty()) {
|
||||||
throw new Exception('未找到课程作业');
|
throw new Exception('未找到课程作业');
|
||||||
}
|
}
|
||||||
$subject_homework->update([
|
$subject_homework->update([
|
||||||
'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']) ? $data['homework_file_url'] : '',
|
'homework_file_url' => isset($data['homework_file_url']) ? $data['homework_file_url'] : '',
|
||||||
'homework_file_name' => isset($data['homework_file_name'])? $data['homework_file_name'] : '',
|
'homework_file_name' => isset($data['homework_file_name']) ? $data['homework_file_name'] : '',
|
||||||
'last_homework_feedback_url' => isset($data['last_homework_feedback_url']) ? $data['last_homework_feedback_url'] : '',
|
'last_homework_feedback_url' => isset($data['last_homework_feedback_url']) ? $data['last_homework_feedback_url'] : '',
|
||||||
'last_homework_feedback_name' => isset($data['last_homework_feedback_name']) ? $data['last_homework_feedback_name'] : '',
|
'last_homework_feedback_name' => isset($data['last_homework_feedback_name']) ? $data['last_homework_feedback_name'] : '',
|
||||||
'subject_report_url' => isset($data['subject_report_url']) ? $data['subject_report_url'] : '',
|
'subject_report_url' => isset($data['subject_report_url']) ? $data['subject_report_url'] : '',
|
||||||
@ -159,7 +165,7 @@ class SubjectHomeworkService
|
|||||||
'code' => ResponseCode::SUCCESS,
|
'code' => ResponseCode::SUCCESS,
|
||||||
'msg' => 'success',
|
'msg' => 'success',
|
||||||
];
|
];
|
||||||
}catch (Exception $e) {
|
} catch (Exception $e) {
|
||||||
return [
|
return [
|
||||||
'code' => ResponseCode::FAIL,
|
'code' => ResponseCode::FAIL,
|
||||||
'msg' => $e->getMessage()
|
'msg' => $e->getMessage()
|
||||||
|
Loading…
x
Reference in New Issue
Block a user