From 6c339d847a6bfd6a89a16f6f3002491ba39585d7 Mon Sep 17 00:00:00 2001 From: Dai Date: Wed, 24 Jul 2024 23:07:51 +0800 Subject: [PATCH] =?UTF-8?q?fix=20=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/model/SubjectHomework.php | 15 --------------- app/common/service/SubjectHomeworkService.php | 16 ++++++++++++++++ 2 files changed, 16 insertions(+), 15 deletions(-) diff --git a/app/common/model/SubjectHomework.php b/app/common/model/SubjectHomework.php index 8f49e2d..b7c5a81 100644 --- a/app/common/model/SubjectHomework.php +++ b/app/common/model/SubjectHomework.php @@ -5,21 +5,6 @@ namespace app\common\model; use app\BaseModel; use support\Model; -/** - * wa_teacher_homework - * @property integer $id (主键) - * @property integer $teacher_id 教师 - * @property integer $teacher_schedule_time_id 教师排课id - * @property integer $subject_id 课程id - * @property string $homework_file_url 家庭作业地址 - * @property string $homework_file_name 家庭作业文件名称 - * @property string $homework_version_file_url 新版本家庭作业 - * @property string $homework_version_file_name 新版本家庭作业文件名称 - * @property integer $is_publish 是否发布 - * @property mixed $created_at 创建时间 - * @property string $update_at 更新时间 - * @property string $deleted_at - */ class SubjectHomework extends BaseModel { diff --git a/app/common/service/SubjectHomeworkService.php b/app/common/service/SubjectHomeworkService.php index 7feac5c..0418df6 100644 --- a/app/common/service/SubjectHomeworkService.php +++ b/app/common/service/SubjectHomeworkService.php @@ -96,6 +96,22 @@ class SubjectHomeworkService ->with(['teacher', 'subject']) ->findOrEmpty(); + if($subject_homework->homework_file_url){ + $subject_homework->homework_file_url = json_decode($subject_homework->homework_file_url, true); + } + if($subject_homework->homework_version_file_url){ + $subject_homework->homework_version_file_url = json_decode($subject_homework->homework_version_file_url, true); + } + if($subject_homework->last_homework_feedback_url){ + $subject_homework->last_homework_feedback_url = json_decode($subject_homework->last_homework_feedback_url, true); + } + if($subject_homework->subject_report_url){ + $subject_homework->subject_report_url = json_decode($subject_homework->subject_report_url, true); + } + if($subject_homework->subject_file_url){ + $subject_homework->subject_file_url = json_decode($subject_homework->subject_file_url, true); + } + return [ 'code' => ResponseCode::SUCCESS, 'data' => $subject_homework,