报告列表

domian/report/report_service.go

@@ -100,7 +100,7 @@ func GetGetReportById(reportId int) (ReportDTO ReportDTO, err error) {
 	return
 }
 
-func GetTotalPageCount() (total int64) {
+func GetTotalPageCount() (total int64, latestId int64, err error) {
 	return reportDao.GetTotalPageCount()
 }
 func GetTotalPageCountByAnalyst(analyst string) (total int64, latestId int64) {

models/report/report.go

@@ -243,9 +243,13 @@ func GetMaxIdByPermissionIds(orgIds map[string][]int) (total int64, maxId int64,
 	}
 	return
 }
-func GetTotalPageCount() (total int64) {
+func GetTotalPageCount() (total int64, latestId int64, err error) {
 	db := models.Main()
-	err := db.Model(&Report{}).Where("status = ?", StatusPublish).Count(&total).Error
+	err = db.Model(&Report{}).Select("MAX(id) id").Where("status = ?", StatusPublish).Scan(&latestId).Error
+	if err != nil {
+		logger.Error("获取最大id失败:%v", err)
+	}
+	err = db.Model(&Report{}).Where("status = ?", StatusPublish).Count(&total).Error
 	if err != nil {
 		logger.Error("统计报告数量失败:%v", err)
 	}

routers/router.go

@@ -4,7 +4,6 @@ import (
 	"eta/eta_mini_ht_api/controllers/media"
 	"eta/eta_mini_ht_api/controllers/report"
 	"eta/eta_mini_ht_api/controllers/user"
-	"eta/eta_mini_ht_api/middleware"
 	"github.com/beego/beego/v2/server/web"
 	"github.com/beego/beego/v2/server/web/filter/cors"
 	"time"
@@ -21,7 +20,7 @@ func init() {
 	}))
 	//增加授权拦截
 
-	web.InsertFilter("*", web.BeforeRouter, middleware.AuthMiddleware())
+	//web.InsertFilter("*", web.BeforeRouter, middleware.AuthMiddleware())
 
 	ns := web.NewNamespace("/htapi",
 		web.NSNamespace("/user",

service/report/report_service.go

@@ -106,14 +106,17 @@ func getETAReportDetail(report *reportService.ReportDTO) (etaReport reportServic
 func getHTReportDetail(report *reportService.ReportDTO) (url string, err error) {
 	return reportService.GetHtReport(report.OrgId)
 }
-func GetTotalPageCount() (total int64) {
+func GetTotalPageCount() (total int64, latestId int64, err error) {
 	return reportService.GetTotalPageCount()
 }
 
 func GetTotalPageCountByPermissionIds(permissionIds []int) (total int64, latestId int64, ids map[string][]int) {
 	if len(permissionIds) == 0 {
-		total = GetTotalPageCount()
-		latestId = total
+		var err error
+		total, latestId, err = GetTotalPageCount()
+		if err != nil {
+			logger.Error("获取统计信息失败:%v", err)
+		}
 		return total, latestId, map[string][]int{}
 	}
 	return reportService.GetTotalPageCountByPermissionIds(permissionIds)