From 08530b80f04f13f5978ec617c146d2217036f90c Mon Sep 17 00:00:00 2001
From: majun <3060162534@qq.com>
Date: Fri, 20 Dec 2024 10:47:00 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=9F=A5=E8=AF=A2=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 link_homework/internal/logic/homework/homework.go | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/link_homework/internal/logic/homework/homework.go b/link_homework/internal/logic/homework/homework.go
index c4bdf17..e5470b2 100644
--- a/link_homework/internal/logic/homework/homework.go
+++ b/link_homework/internal/logic/homework/homework.go
@@ -71,9 +71,18 @@ func UpdateHomework(ctx context.Context, homeworkList []*entity.ActivityInteract
 		}
 	}
 
-	// 对 homeworkList 按 Status 升序排序
+	// 对 homeworkList 进行排序
 	sort.Slice(homeworkList, func(i, j int) bool {
-		return homeworkList[i].Status < homeworkList[j].Status
+		if homeworkList[i].Status != homeworkList[j].Status {
+			return homeworkList[i].Status < homeworkList[j].Status
+		}
+		if homeworkList[i].Status == 0 {
+			return homeworkList[i].StartDate.Before(homeworkList[j].StartDate)
+		}
+		if homeworkList[i].Status == 1 {
+			return homeworkList[i].EndDate.Before(homeworkList[j].EndDate)
+		}
+		return false
 	})
 
 	return homeworkList