Compare commits
No commits in common. "a145e6c1e63854cfbb67c93ede6018ebd20cccd8" and "928cdd3064672539ac0f2e3acba3b9aab3dab6b3" have entirely different histories.
a145e6c1e6
...
928cdd3064
@ -22,8 +22,6 @@ func (annualReportsDao) List(req *reports.GetAnnualReportListReq) (data []model.
|
|||||||
dbQuery = dbQuery.Where("status = ?", req.Filtrate.Status)
|
dbQuery = dbQuery.Where("status = ?", req.Filtrate.Status)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
// 按更新时间倒序排列
|
|
||||||
dbQuery = dbQuery.Order("updated_at DESC")
|
|
||||||
//数据查询
|
//数据查询
|
||||||
dbQuery.Count(&total)
|
dbQuery.Count(&total)
|
||||||
err = dbQuery.Scopes(db.Pagination(req.Page, req.PageSize)).Find(&data).Error
|
err = dbQuery.Scopes(db.Pagination(req.Page, req.PageSize)).Find(&data).Error
|
||||||
|
|||||||
@ -22,8 +22,6 @@ func (quarterlyReportsDao) List(req *reports.GetQuarterlyReportListReq) (data []
|
|||||||
dbQuery = dbQuery.Where("status = ?", req.Filtrate.Status)
|
dbQuery = dbQuery.Where("status = ?", req.Filtrate.Status)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
// 按更新时间倒序排列
|
|
||||||
dbQuery = dbQuery.Order("updated_at DESC")
|
|
||||||
dbQuery.Count(&total)
|
dbQuery.Count(&total)
|
||||||
err = dbQuery.Scopes(db.Pagination(req.Page, req.PageSize)).Find(&data).Error
|
err = dbQuery.Scopes(db.Pagination(req.Page, req.PageSize)).Find(&data).Error
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user