Merge branch 'master' of http://gitea.enheng.asia/risin9/course

app/api/controller/StudentController.php

@@ -132,7 +132,7 @@ class StudentController extends BaseController
             'file_path' => public_path($file_path),//图片保存路径
             'title_height' => 30,//报表名称高度
             'title_font_size' => 16,//报表名称字体大小
-            'font_ulr' => public_path('/111.ttf'),//字体文件路径
+            'font_ulr' => public_path('/Alibaba-PuHuiTi-Light.ttf'),//字体文件路径
             'text_size' => 12,//正文字体大小
             'row_hight' => 30,//每行数据行高
             'filed_id_width' => 60,//序号列的宽度

app/common/service/SendMsgCronJobService.php

@@ -578,7 +578,9 @@ class SendMsgCronJobService
     {
         try {
             $teacher_schedule_time = TeacherScheduleTime::where(['is_publish' => 1])
-                ->whereBetweenTime('start_time', date('Y-m-d H:i:00', strtotime('+10 minute')), date('Y-m-d H:i:00', strtotime('+11 minute')))
+                ->whereTime('start_time', '>=', date('Y-m-d H:i:00', strtotime('+10 minute')))
+                ->whereTime('start_time', '<', date('Y-m-d H:i:00', strtotime('+11 minute')))
+//                ->whereBetweenTime('start_time', date('Y-m-d H:i:00', strtotime('+10 minute')), date('Y-m-d H:i:00', strtotime('+11 minute')))
                 ->with(['teacherAttr', 'subject', 'studentSchedule'])
                 ->select();
 

app/common/service/SubjectHomeworkService.php

@@ -121,10 +121,15 @@ class SubjectHomeworkService
     {
         try {
             $data = $request->get();
-            $subject_homework = SubjectHomework::where(['teacher_schedule_time_id' => $data['teacher_schedule_time_id']])
+            if (!empty((array)$request->teacher)) {
-                ->where(['homework_file_is_publish' => 1])
+                $subject_homework = SubjectHomework::where(['teacher_schedule_time_id' => $data['teacher_schedule_time_id']])
-                ->with(['teacher', 'subject'])
+                    ->with(['teacher', 'subject'])
-                ->findOrEmpty();
+                    ->findOrEmpty();
+            }else{
+                $subject_homework = SubjectHomework::where(['teacher_schedule_time_id' => $data['teacher_schedule_time_id']])
+                    ->with(['teacher', 'subject'])
+                    ->findOrEmpty();
+            }
 
             if ($subject_homework->homework_file_url) {
                 $subject_homework->homework_file_url = json_decode($subject_homework->homework_file_url, true);
@@ -175,10 +180,31 @@ class SubjectHomeworkService
         try {
 
             $data = $request->get();
-            $subject_homework = SubjectHomework::where(['teacher_schedule_time_id' => $data['teacher_schedule_time_id'], 'is_publish' => 1])
+            $subject_homework = SubjectHomework::where(['teacher_schedule_time_id' => $data['teacher_schedule_time_id']])
                 ->with(['teacher', 'subject'])
                 ->findOrEmpty();
 
+            if(!$subject_homework->homework_file_is_publish){
+                $subject_homework->homework_file_url = '';
+            }
+            if(!$subject_homework->homework_version_is_publish){
+                $subject_homework->homework_version_file_url = '';
+            }
+            if(!$subject_homework->last_homework_feedback_is_publish){
+                $subject_homework->last_homework_feedback_url = '';
+            }
+            if(!$subject_homework->subject_report_version_is_publish){
+                $subject_homework->subject_report_version_url = '';
+            }
+
+            if(!$subject_homework->subject_report_version_is_publish){
+                $subject_homework->subject_report_version_url = '';
+            }
+
+            if(!$subject_homework->subject_file_version_is_publish){
+                $subject_homework->subject_file_version_url = '';
+            }
+
 
             if ($subject_homework->homework_file_url) {
                 $subject_homework->homework_file_url = json_decode($subject_homework->homework_file_url, true);
@@ -271,4 +297,4 @@ class SubjectHomeworkService
         }
     }
 
-}
+}