fix: 学生端只获取发布后的课程
This commit is contained in:
parent
102dbb4a17
commit
23e33fc5d5
@ -41,7 +41,7 @@ class StudentHomeworkService
|
|||||||
$data = $request->post();
|
$data = $request->post();
|
||||||
|
|
||||||
$student_schedule = StudentSchedule::where(['id' => $data['subject_homework_id']])->findOrEmpty();
|
$student_schedule = StudentSchedule::where(['id' => $data['subject_homework_id']])->findOrEmpty();
|
||||||
if($student_schedule->isEmpty()){
|
if ($student_schedule->isEmpty()) {
|
||||||
throw new Exception('未找到学生排课信息');
|
throw new Exception('未找到学生排课信息');
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -157,7 +157,7 @@ class StudentHomeworkService
|
|||||||
|
|
||||||
if ($data['status'] == 0) {
|
if ($data['status'] == 0) {
|
||||||
//未提交作业的课程
|
//未提交作业的课程
|
||||||
$model = StudentSchedule::order('id desc')->where('id', 'not in', function ($query) use ($student) {
|
$model = StudentSchedule::order('id desc')->where(['is_publish' => 1])->where('id', 'not in', function ($query) use ($student) {
|
||||||
$query->table('wa_student_homework')->where('student_id', $student->id)->field('teacher_schedule_time_id');
|
$query->table('wa_student_homework')->where('student_id', $student->id)->field('teacher_schedule_time_id');
|
||||||
})->where('student_id', $student->id);
|
})->where('student_id', $student->id);
|
||||||
$total = $model->count();
|
$total = $model->count();
|
||||||
@ -167,7 +167,7 @@ class StudentHomeworkService
|
|||||||
|
|
||||||
} else {
|
} else {
|
||||||
$model = StudentSchedule::order('id desc')
|
$model = StudentSchedule::order('id desc')
|
||||||
->where(['student_id' => $student->id])
|
->where(['student_id' => $student->id, 'is_publish' => 1])
|
||||||
->where('id', 'in', function ($query) use ($student) {
|
->where('id', 'in', function ($query) use ($student) {
|
||||||
$query->table('wa_student_homework')->where('student_id', $student->id)->field('teacher_schedule_time_id');
|
$query->table('wa_student_homework')->where('student_id', $student->id)->field('teacher_schedule_time_id');
|
||||||
});
|
});
|
||||||
@ -226,7 +226,7 @@ class StudentHomeworkService
|
|||||||
->with(['student', 'teacher', 'subject'])
|
->with(['student', 'teacher', 'subject'])
|
||||||
->findOrEmpty();
|
->findOrEmpty();
|
||||||
|
|
||||||
if($homework->feedback_file_url){
|
if ($homework->feedback_file_url) {
|
||||||
$homework->feedback_file_url = json_decode($homework->feedback_file_url, true);
|
$homework->feedback_file_url = json_decode($homework->feedback_file_url, true);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user