From 7d2507bd1a9ff5a5eb9fd356a77f35bcb2a85f47 Mon Sep 17 00:00:00 2001 From: Dai Date: Wed, 24 Jul 2024 21:37:37 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E4=BD=9C=E4=B8=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/common/service/SubjectHomeworkService.php | 46 +++++++++++-------- 1 file changed, 26 insertions(+), 20 deletions(-) diff --git a/app/common/service/SubjectHomeworkService.php b/app/common/service/SubjectHomeworkService.php index e59e729..7feac5c 100644 --- a/app/common/service/SubjectHomeworkService.php +++ b/app/common/service/SubjectHomeworkService.php @@ -34,17 +34,23 @@ class SubjectHomeworkService 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(); +// $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 (!$subject_homework->isEmpty()) { - throw new Exception('家庭作业已存在，请勿重复提交'); + if (isset($data['subject_homework_id']) && !empty($data['subject_homework_id'])) { + $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_schedule_time_id' => $data['teacher_schedule_time_id'], 'date' => $teacher_schedule_time->date, @@ -54,14 +60,14 @@ class SubjectHomeworkService 'month' => $teacher_schedule_time->month, 'subject_id' => $teacher_schedule_time->subject_id, '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_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_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_name' => isset($data['subject_report_name']) ? $data['subject_report_name'] : '', - 'subject_file_url' => isset($data['subject_file_url']) ? $data['subject_file_url'] : '', - 'subject_file_name' => isset($data['subject_file_name']) ? $data['subject_file_name'] : '', + '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']) ? json_encode($data['homework_file_name'], JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES) : '', + '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']) ? json_encode($data['last_homework_feedback_name'], JSON_UNESCAPED_UNICODE, JSON_UNESCAPED_SLASHES) : '', + '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 [ @@ -139,14 +145,14 @@ class SubjectHomeworkService { try { $data = $request->post(); - $subject_homework = SubjectHomework::where(['id'=>$data['subject_homework_id']])->findOrEmpty(); - if($subject_homework->isEmpty()){ + $subject_homework = SubjectHomework::where(['id' => $data['subject_homework_id']])->findOrEmpty(); + if ($subject_homework->isEmpty()) { throw new Exception('未找到课程作业'); } $subject_homework->update([ '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_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_name' => isset($data['last_homework_feedback_name']) ? $data['last_homework_feedback_name'] : '', 'subject_report_url' => isset($data['subject_report_url']) ? $data['subject_report_url'] : '', @@ -159,7 +165,7 @@ class SubjectHomeworkService 'code' => ResponseCode::SUCCESS, 'msg' => 'success', ]; - }catch (Exception $e) { + } catch (Exception $e) { return [ 'code' => ResponseCode::FAIL, 'msg' => $e->getMessage()