Browse Source

解决跨库查询

majun
majun 5 months ago
parent
commit
019af5b2dc
  1. 2
      link_homework/internal/logic/homework/homework.go
  2. 2
      link_homework/internal/model/entity/activity_interactive_group.go

2
link_homework/internal/logic/homework/homework.go

@ -3,6 +3,7 @@ package homework
import ( import (
"context" "context"
"fmt" "fmt"
"github.com/gogf/gf/v2/database/gdb"
"github.com/gogf/gf/v2/frame/g" "github.com/gogf/gf/v2/frame/g"
"github.com/gogf/gf/v2/os/gtime" "github.com/gogf/gf/v2/os/gtime"
"link_homework/api/v1/homework" "link_homework/api/v1/homework"
@ -26,6 +27,7 @@ func New() service.IHomework {
func (s *sHomework) GetHomeworkList(ctx context.Context, pageNo int, pageSize int) (homeworkList []*entity.ActivityInteractiveGroup, err error) { func (s *sHomework) GetHomeworkList(ctx context.Context, pageNo int, pageSize int) (homeworkList []*entity.ActivityInteractiveGroup, err error) {
err = dao.ActivityInteractiveGroup.Ctx(ctx).With(entity.Live{}).Order("start_date desc, end_date desc").Page(pageNo, pageSize).Scan(&homeworkList) err = dao.ActivityInteractiveGroup.Ctx(ctx).With(entity.Live{}).Order("start_date desc, end_date desc").Page(pageNo, pageSize).Scan(&homeworkList)
err = g.DB("cms").Model("fx_article").Where("id", gdb.ListItemValuesUnique(homeworkList, "ArticleId")).ScanList(&homeworkList, "Article", "id:ArticleId")
for _, v := range homeworkList { for _, v := range homeworkList {
if v.StartDate.After(gtime.Now()) { if v.StartDate.After(gtime.Now()) {
v.Status = 0 v.Status = 0

2
link_homework/internal/model/entity/activity_interactive_group.go

@ -20,7 +20,7 @@ type ActivityInteractiveGroup struct {
LiveId int `json:"liveId" orm:"live_id" description:"关联直播id"` // 关联直播id LiveId int `json:"liveId" orm:"live_id" description:"关联直播id"` // 关联直播id
StartDate *gtime.Time `json:"startDate" orm:"start_date" description:"作业开始时间"` // 作业开始时间 StartDate *gtime.Time `json:"startDate" orm:"start_date" description:"作业开始时间"` // 作业开始时间
EndDate *gtime.Time `json:"endDate" orm:"end_date" description:"作业结束时间"` // 作业结束时间 EndDate *gtime.Time `json:"endDate" orm:"end_date" description:"作业结束时间"` // 作业结束时间
Article *FxArticle `json:"article" orm:"with:id=article_id" description:"关联文章"` // 关联文章
Article *FxArticle `json:"article" description:"关联文章"` // 关联文章
Live *Live `json:"live" orm:"with:id=live_id" description:"关联直播"` // 关联直播 Live *Live `json:"live" orm:"with:id=live_id" description:"关联直播"` // 关联直播
Count int `json:"count" description:"作业提交次数"` // 作业结束时间 Count int `json:"count" description:"作业提交次数"` // 作业结束时间
} }
Loading…
Cancel
Save