|
@ -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 |
|
|