Merge branch 'feat-hjj-ReportsManage' into dev

This commit is contained in:
jiaji.H 2025-09-29 11:35:47 +08:00
commit a145e6c1e6
2 changed files with 4 additions and 0 deletions

View File

@ -22,6 +22,8 @@ func (annualReportsDao) List(req *reports.GetAnnualReportListReq) (data []model.
dbQuery = dbQuery.Where("status = ?", req.Filtrate.Status)
}
}
// 按更新时间倒序排列
dbQuery = dbQuery.Order("updated_at DESC")
//数据查询
dbQuery.Count(&total)
err = dbQuery.Scopes(db.Pagination(req.Page, req.PageSize)).Find(&data).Error

View File

@ -22,6 +22,8 @@ func (quarterlyReportsDao) List(req *reports.GetQuarterlyReportListReq) (data []
dbQuery = dbQuery.Where("status = ?", req.Filtrate.Status)
}
}
// 按更新时间倒序排列
dbQuery = dbQuery.Order("updated_at DESC")
dbQuery.Count(&total)
err = dbQuery.Scopes(db.Pagination(req.Page, req.PageSize)).Find(&data).Error
if err != nil {