From 0268c9c0189673d30cd1ab203af3ea73f5a5f219 Mon Sep 17 00:00:00 2001 From: Dai Date: Tue, 11 Feb 2025 21:48:46 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BD=9C=E4=B8=9A=E6=8C=89=E7=85=A7?= =?UTF-8?q?=E6=97=B6=E9=97=B4=E5=80=92=E5=8F=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/common/service/StudentHomeworkService.php | 3 ++- plugin/admin/app/controller/SubjectHomeworkController.php | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/app/common/service/StudentHomeworkService.php b/app/common/service/StudentHomeworkService.php index 69160af..bee20a2 100644 --- a/app/common/service/StudentHomeworkService.php +++ b/app/common/service/StudentHomeworkService.php @@ -175,9 +175,10 @@ class StudentHomeworkService $total = $model->count(); $list = $model->with(['student', 'subject', 'teacher']) ->page($page, $limit) + ->order('start_time desc') ->select()->toArray(); } else { - $model = StudentSchedule::order('id desc') + $model = StudentSchedule::order('start_time desc,id desc') ->where(['student_id' => $student->id, 'is_publish' => 1]) ->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'); diff --git a/plugin/admin/app/controller/SubjectHomeworkController.php b/plugin/admin/app/controller/SubjectHomeworkController.php index e044b3e..09f05f9 100644 --- a/plugin/admin/app/controller/SubjectHomeworkController.php +++ b/plugin/admin/app/controller/SubjectHomeworkController.php @@ -50,7 +50,7 @@ class SubjectHomeworkController extends Crud public function select(Request $request): Response { 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') ->leftJoin('student_homework sth', 'sth.subject_homework_id = sh.id') ->leftJoin('student s', 's.id = sth.student_id')