admin/course
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: 作业按照时间倒叙

Browse Source
This commit is contained in:
Dai 2025-02-11 21:48:46 +08:00
parent b8aa08b285
commit 0268c9c018
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/common/service/StudentHomeworkService.php
View File

@ -175,9 +175,10 @@ class StudentHomeworkService
$total = $model->count(); $total = $model->count();
$list = $model->with(['student', 'subject', 'teacher']) $list = $model->with(['student', 'subject', 'teacher'])
->page($page, $limit) ->page($page, $limit)
->order('start_time desc')
->select()->toArray(); ->select()->toArray();
} else { } else {
$model = StudentSchedule::order('id desc') $model = StudentSchedule::order('start_time desc,id desc')
->where(['student_id' => $student->id, 'is_publish' => 1]) ->where(['student_id' => $student->id, 'is_publish' => 1])
->where('teacher_schedule_time_id', 'in', function ($query) use ($student) { ->where('teacher_schedule_time_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');

2
plugin/admin/app/controller/SubjectHomeworkController.php
View File

@ -50,7 +50,7 @@ class SubjectHomeworkController extends Crud
public function select(Request $request): Response public function select(Request $request): Response
{ {
try { try {
$homework = \app\common\model\SubjectHomework::order('wa_subject_homework.id desc') $homework = \app\common\model\SubjectHomework::order('wa_subject_homework.start_time desc, wa_subject_homework.id desc')
->alias('sh') ->alias('sh')
->leftJoin('student_homework sth', 'sth.subject_homework_id = sh.id') ->leftJoin('student_homework sth', 'sth.subject_homework_id = sh.id')
->leftJoin('student s', 's.id = sth.student_id') ->leftJoin('student s', 's.id = sth.student_id')