From c1206fbf1d0d096130e4bf3f2ce69b01d29fbd14 Mon Sep 17 00:00:00 2001 From: lijikun Date: Tue, 24 Dec 2024 17:09:14 +0800 Subject: [PATCH] =?UTF-8?q?12=E6=9C=8824=E6=97=A5=E4=B8=8B=E5=8D=88?= =?UTF-8?q?=E5=90=8E=E5=8F=B0=E6=9F=A5=E8=AF=A2=E9=A1=B5=E9=9D=A2=E9=80=BB?= =?UTF-8?q?=E8=BE=91,token=E8=BF=87=E6=9C=9F=E6=97=B6=E9=97=B4,=E5=B0=86?= =?UTF-8?q?=E5=AF=BC=E5=87=BA=E6=96=B9=E6=B3=95=E5=88=86=E7=A6=BB=E5=88=B0?= =?UTF-8?q?service?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- link_homework/internal/controller/record/manageRecord.go | 3 +++ link_homework/internal/logic/homework/homework.go | 14 ++++++-------- .../internal/model/entity/activity_interactive_group.go | 2 +- 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/link_homework/internal/controller/record/manageRecord.go b/link_homework/internal/controller/record/manageRecord.go index c6261d0..408ea8d 100644 --- a/link_homework/internal/controller/record/manageRecord.go +++ b/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{} diff --git a/link_homework/internal/logic/homework/homework.go b/link_homework/internal/logic/homework/homework.go index 7b4090f..278cf9a 100644 --- a/link_homework/internal/logic/homework/homework.go +++ b/link_homework/internal/logic/homework/homework.go @@ -90,10 +90,8 @@ 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() - } + result, _ := dao.ActivityInteractiveRecord.Ctx(ctx).Where("group_id", v.Id).Group("form_id").Limit(1).Value("COUNT(*)") + v.Count = result.Int() } } @@ -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 diff --git a/link_homework/internal/model/entity/activity_interactive_group.go b/link_homework/internal/model/entity/activity_interactive_group.go index d71670a..869816a 100644 --- a/link_homework/internal/model/entity/activity_interactive_group.go +++ b/link_homework/internal/model/entity/activity_interactive_group.go @@ -22,6 +22,6 @@ type ActivityInteractiveGroup struct { EndDate *gtime.Time `json:"endDate" orm:"end_date" description:"作业结束时间"` // 作业结束时间 Article *FxArticle `json:"article" description:"关联文章"` // 关联文章 Live *Live `json:"live" orm:"with:id=live_id" description:"关联直播"` // 关联直播 - Form []*ActivityInteractiveForm `json:"form" orm:"with:group_id=id" description:"关联题目"` + Form []*ActivityInteractiveForm `json:"form" orm:"with:group_id=id" description:"关联题目"` Count int `json:"count" description:"作业提交次数"` }