From a882ee676a60affa7ea78b73b5bff3f0b141af18 Mon Sep 17 00:00:00 2001
From: majun <3060162534@qq.com>
Date: Tue, 24 Dec 2024 19:08:15 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E5=9B=9E=E6=BB=9A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 link_homework/internal/logic/homework/homework.go | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/link_homework/internal/logic/homework/homework.go b/link_homework/internal/logic/homework/homework.go
index 278cf9a..6f3594e 100644
--- a/link_homework/internal/logic/homework/homework.go
+++ b/link_homework/internal/logic/homework/homework.go
@@ -68,7 +68,7 @@ func UpdateHomework(ctx context.Context, homeworkList []*entity.ActivityInteract
 		if v.Status != 2 {
 			if v.StartDate.After(gtime.Now()) {
 				v.Status = 0
-			} else if v.EndDate.Before(gtime.Now().AddDate(0, 0, -1)) {
+			} else if v.EndDate.Before(gtime.Now()) {
 				v.Status = 2
 				cnt++
 				_, _ = dao.ActivityInteractiveGroup.Ctx(ctx).Data(do.ActivityInteractiveGroup{
@@ -90,8 +90,10 @@ func UpdateHomework(ctx context.Context, homeworkList []*entity.ActivityInteract
 func InitHomework(ctx context.Context, homeworkList []*entity.ActivityInteractiveGroup) []*entity.ActivityInteractiveGroup {
 	for _, v := range homeworkList {
 		if v.Status == 2 {
-			result, _ := dao.ActivityInteractiveRecord.Ctx(ctx).Where("group_id", v.Id).Group("form_id").Limit(1).Value("COUNT(*)")
-			v.Count = result.Int()
+			if v.Status != 0 {
+				result, _ := dao.ActivityInteractiveRecord.Ctx(ctx).Where("group_id", v.Id).Group("form_id").Limit(1).Value("COUNT(*)")
+				v.Count = result.Int()
+			}
 		}
 	}
 
@@ -116,7 +118,7 @@ func (s *sHomework) AddHomework(ctx context.Context, req *homework.AddHomeworkRe
 	// 判断作业是否已结束
 	status := 0
 	if req.StartDate.Before(gtime.Now()) {
-		if req.EndDate.Before(gtime.Now().AddDate(0, 0, -1)) {
+		if req.EndDate.Before(gtime.Now()) {
 			return fmt.Errorf("作业时间已过期，无法添加！")
 		} else {
 			status = 1
@@ -174,18 +176,18 @@ func (s *sHomework) EditHomework(ctx context.Context, req *homework.EditHomework
 	// 判断作业是否已结束
 	var nowhomework *entity.ActivityInteractiveGroup
 	err = dao.ActivityInteractiveGroup.Ctx(ctx).WherePri(req.Id).Scan(&nowhomework)
-	if nowhomework.EndDate.Before(gtime.Now().AddDate(0, 0, -1)) {
+	if nowhomework.EndDate.Before(gtime.Now()) {
 		return fmt.Errorf("作业已结束，无法修改！")
 	} else {
 		// 判断作业是否已开始
-		flag := true //作业未开始
+		flag := true
 		if nowhomework.StartDate.Before(gtime.Now()) {
-			flag = false //作业已开始
+			flag = false
 		}
 		// 判断提交修改表单状态
 		status := 0
 		if req.StartDate.Before(gtime.Now()) {
-			if req.EndDate.Before(gtime.Now().AddDate(0, 0, -1)) {
+			if req.EndDate.Before(gtime.Now()) {
 				status = 2
 			} else {
 				status = 1