From 35f2f50e31c0c308ac8190d11ab1fd7cbdd10ea8 Mon Sep 17 00:00:00 2001
From: Dai <test@test.com>
Date: Mon, 7 Oct 2024 23:20:46 +0800
Subject: [PATCH] =?UTF-8?q?fix=20=E4=B8=8A=E4=BC=A0=E8=AF=BE=E7=A8=8B?=
 =?UTF-8?q?=E6=96=87=E4=BB=B6=E6=8F=90=E9=86=92=E5=AE=B6=E9=95=BF=E3=80=81?=
 =?UTF-8?q?=E5=AD=A6=E7=94=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/common/service/SendMsgCronJobService.php |  6 ++++--
 plugin/admin/app/view/cron-job/index.html    | 16 ++++++++++++++++
 2 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/app/common/service/SendMsgCronJobService.php b/app/common/service/SendMsgCronJobService.php
index 08a06ab..9376f6d 100644
--- a/app/common/service/SendMsgCronJobService.php
+++ b/app/common/service/SendMsgCronJobService.php
@@ -33,6 +33,8 @@ class SendMsgCronJobService
     const SUBJECT_UPLOAD_NOTIFY_ADMIN = 'subject_upload_notify_admin';
     const SUBJECT_VERSION_UPLOAD_NOTIFY_STUDENT = 'subject_version_upload_notify_student';
     const SUBJECT_VERSION_UPLOAD_NOTIFY_PARENT = 'subject_version_upload_notify_parent';
+    const SUBJECT_REPORT_UPLOAD_NOTIFY_STUDENT = 'subject_report_upload_notify_student';
+    const SUBJECT_REPORT_UPLOAD_NOTIFY_PARENT = 'subject_report_upload_notify_parent';
     const STUDENT_UPLOAD_HOMEWORK_NOTIFY_TEACHER = 'student_upload_homework_notify_teacher';
     const ADMIN_NOTIFY_STUDENT_SCHEDULE_TIME = 'admin_notify_student_schedule_time';
     const ADMIN_NOTIFY_TEACHER_SUBMIT_FREE_TIME = 'admin_notify_teacher_submit_free_time';
@@ -1063,7 +1065,7 @@ class SendMsgCronJobService
                 //@todo:写入日志中
 
                 CronJob::create([
-                    'msg_type' => self::SUBJECT_VERSION_UPLOAD_NOTIFY_STUDENT,
+                    'msg_type' => self::SUBJECT_REPORT_UPLOAD_NOTIFY_STUDENT,
                     'teacher_id' => $subject_homework->teacher_id,
                     'subject_id' => $subject_homework->subject_id,
                     'student_id' => '',
@@ -1117,7 +1119,7 @@ class SendMsgCronJobService
                     //@todo:写入日志中
 
                     CronJob::create([
-                        'msg_type' => self::SUBJECT_VERSION_UPLOAD_NOTIFY_PARENT,
+                        'msg_type' => self::SUBJECT_REPORT_UPLOAD_NOTIFY_PARENT,
                         'teacher_id' => $subject_homework->teacher_id,
                         'subject_id' => $subject_homework->subject_id,
                         'student_id' => '',
diff --git a/plugin/admin/app/view/cron-job/index.html b/plugin/admin/app/view/cron-job/index.html
index ebc6a1e..7dd2546 100644
--- a/plugin/admin/app/view/cron-job/index.html
+++ b/plugin/admin/app/view/cron-job/index.html
@@ -227,6 +227,22 @@
                     <span>本地时间：{{d.msg_info.date}} {{d.msg_info.en_time}}</span>
                 </div>
 <!--                <span class="layui-badge layui-bg-green">课程作业上传提醒管理员</span>-->
+                {{# }else if(d.msg_type == 'subject_report_upload_notify_student'){ }}
+                <div>
+                    <span>教师：{{d.msg_info.subject_homework.teacher_name}}</span>
+                    <span>课程：{{d.msg_info.subject_homework.english_name}}</span>
+                    <span>本地时间：{{d.msg_info.subject_homework.date}} {{d.msg_info.subject_homework.en_time}}</span>
+                    <span>本地时间：{{d.msg_info.subject_homework.date}} {{d.msg_info.subject_homework.en_time}}</span>
+                    <span>学生：{{d.msg_info.student.student_name}}</span>
+                </div>
+                {{# }else if(d.msg_type == 'subject_report_upload_notify_parent'){ }}
+                <div>
+                    <span>教师：{{d.msg_info.subject_homework.teacher_name}}</span>
+                    <span>课程：{{d.msg_info.subject_homework.english_name}}</span>
+                    <span>本地时间：{{d.msg_info.subject_homework.date}} {{d.msg_info.subject_homework.en_time}}</span>
+                    <span>本地时间：{{d.msg_info.subject_homework.date}} {{d.msg_info.subject_homework.en_time}}</span>
+                    <span>家长：{{d.msg_info.parent.account}}</span>
+                </div>
                 {{# }else if(d.msg_type == 'subject_version_upload_notify_student'){ }}
                 <div>
                     <span>教师：{{d.msg_info.subject_homework.teacher_name}}</span>