fix bug

app/api/controller/SendMsgCronJobController.php

@@ -72,4 +72,12 @@ class SendMsgCronJobController extends BaseController
 
 
 
+    public function uploadVersionSubjectHomeworkNotifyStudent(Request $request)
+    {
+        $res = (new SendMsgCronJobService())->uploadVersionSubjectHomeworkNotifyStudent(10);
+
+        return $this->json($res);
+    }
+
+
 }

app/common/model/SubjectHomework.php

@@ -24,4 +24,13 @@ class SubjectHomework extends BaseModel
         ]);
     }
 
+    /**
+     * @desc 安排学生
+     * @return \think\model\relation\HasMany
+     */
+    public function studentHomework()
+    {
+        return $this->hasMany(StudentHomework::class, 'subject_homework_id', 'id');
+    }
+    
 }

app/common/service/SendMsgCronJobService.php

@@ -265,10 +265,26 @@ class SendMsgCronJobService
     }
 
 
+    /**
+     * @desc 老师上传作业后台管理员人员翻译过，重新上传通知学生
+     * @param $subject_homework_id
+     * @return array|void
+     * @throws \GuzzleHttp\Exception\GuzzleException
+     */
     public function uploadVersionSubjectHomeworkNotifyStudent($subject_homework_id)
     {
         try {
             $subject_homework = SubjectHomework::where(['id' => $subject_homework_id])->with(['teacher', 'subject'])->findOrEmpty();
+
+
+            //查找相同老师、相同课程、相同学生的下一节课
+            $teacher_schedule_time = TeacherScheduleTime::where(['id' => $subject_homework->teacher_schedule_time_id])->with(['studentSchedule'])->findOrEmpty();
+
+            print '<pre>';
+            print_r($teacher_schedule_time->toArray());
+            die;
+
+
             if (!empty($subject_homework->homework_version_file_url)) {
                 $send_teacher_data = [
                     'touser' => 'olfLh6o4CG9xb6_tA3y29shOj_Bo',//@todo：发送人

app/common/service/SubjectHomeworkService.php

@@ -28,12 +28,16 @@ class SubjectHomeworkService
                 throw new Exception('未找到教师信息，设置失败');
             }
             $data = $request->post();
-            $teacher_schedule_time = TeacherScheduleTime::where(['id' => $data['teacher_schedule_time_id']])->findOrEmpty();
+            $teacher_schedule_time = TeacherScheduleTime::where(['id' => $data['teacher_schedule_time_id'], 'is_publish' => 1])->findOrEmpty();
 
             if ($teacher_schedule_time->isEmpty()) {
                 throw new Exception('未找到教师课程安排');
             }
 
+            if (empty($teacher_schedule_time->subject_id)) {
+                throw new Exception('未安排课程');
+            }
+
 
             if (isset($data['subject_homework_id']) && !empty($data['subject_homework_id'])) {
                 $subject_homework = SubjectHomework::where(['id' => $data['subject_homework_id']])->findOrEmpty();

app/utils/WechatUtil.php

@@ -21,7 +21,7 @@ class WechatUtil
     public static function getAccessToken()
     {
         try {
-//            $str = '83_5nmVfFogqz0nUC-sXhNJNRAcD6doq1N3E-g2fb3ty1RqqZq2kXazJDA2-z5TibuSmmUdFh6RlEzojOx1hWMp1dkKKpAQOH7GIuvz0RWTRfYAdeTiDaeRcDXx6TsDOUdABATEK';
+//            $str = '83_s2360Qbo3QwQgLRYvmeRjBWkLxkP2gbhfc6D-oT31f2oQ5S47rXfTc52dyxBNZ9ZMuVTnEWBxyuAZ-OVZolz5_PDu7wTmzuPT3n8_g6TyeZv__ZliUG5GX3U9LsGQIcAJAVFX';
 //            Cache::set(self::GENERAL_ACCESS_TOKEN, $str, 3500);
             if (Cache::has(self::GENERAL_ACCESS_TOKEN)) {
                 return Cache::get(self::GENERAL_ACCESS_TOKEN);

plugin/admin/app/view/subject-homework/update.html

@@ -62,6 +62,13 @@
             </div>
 
 
+            <div class="layui-form-item">
+                <label class="layui-form-label">课程作业</label>
+                <div class="layui-input-block">
+                    <input type="text" name="content" value="{$subject_homework['content']}"
+                           class="layui-input">
+                </div>
+            </div>
             <div class="layui-form-item">
                 <label class="layui-form-label">课程作业网址</label>
                 <div class="layui-input-block">
@@ -130,8 +137,8 @@
             <div class="layui-form-item">
                 <label class="layui-form-label">上次作业</label>
                 <div class="layui-input-block" id="last_homework_feedback_url">
-                    {if !empty($subject_homework['homework_version_file_url'])}
-                    {foreach $subject_homework['homework_version_file_url'] as $index => $item}
+                    {if !empty($subject_homework['last_homework_feedback_url'])}
+                    {foreach $subject_homework['last_homework_feedback_url'] as $index => $item}
                     <div style="margin-top: 10px;display: inline-block;">
                         <div style="width: 250px;">
                             <span><a href="{$item['url']}">{$item['name']}</a></span>