12月24日下午后台查询页面逻辑,token过期时间,将导出方法分离到service

link_homework/internal/controller/record/manageRecord.go

@@ -1,10 +1,13 @@
 package record
 
 import (
+	"github.com/360EntSecGroup-Skylar/excelize"
 	"github.com/gogf/gf/v2/net/ghttp"
 	"link_homework/api/v1/record"
 	"link_homework/internal/model/dto"
 	"link_homework/internal/service"
+	"strconv"
+	"time"
 )
 
 type ManageRecord struct{}

link_homework/internal/logic/homework/homework.go

@@ -90,12 +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 {
-			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()
 		}
 	}
-	}
 
 	return homeworkList
 }
@@ -176,18 +174,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()) {
+	if nowhomework.EndDate.Before(gtime.Now().AddDate(0, 0, -1)) {
 		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()) {
+			if req.EndDate.Before(gtime.Now().AddDate(0, 0, -1)) {
 				status = 2
 			} else {
 				status = 1