研究员列表查询

controllers/user/analyst_controller.go

@@ -30,15 +30,13 @@ func (an *AnalystController) AnalystList() {
 			PageSize: an.PageInfo.PageSize,
 		}
 		if an.PageInfo.LatestId == 0 {
-			pageRes.Total = analyst.GetAnalystCount()
-			pageRes.LatestId = pageRes.Total
+			pageRes.Total, pageRes.LatestId = analyst.GetAnalystCount()
 			an.PageInfo.LatestId = pageRes.LatestId
 			an.PageInfo.Total = pageRes.Total
 		} else {
 			pageRes.LatestId = an.PageInfo.LatestId
 			pageRes.Total = an.PageInfo.Total
 		}
-		pageRes.Total = analyst.GetAnalystCount()
 		an.PageInfo.Total = pageRes.Total
 		pageRes.TotalPage = page.TotalPages(pageRes.Total, pageRes.PageSize)
 		list, err := analyst.GetAnalystList(an.PageInfo, userInfo.Id)

domian/financial_analyst/financial_analyst_service.go

@@ -18,8 +18,8 @@ type FinancialAnalystDTO struct {
 
 func GetAnalystList(pageInfo page.PageInfo) (analystsDTO []FinancialAnalystDTO, err error) {
 	offset := page.StartIndex(pageInfo.Current, pageInfo.PageSize)
-	anaylsts, err := financialAnalystDao.GetAnalystList(pageInfo.LatestId, offset, pageInfo.PageSize)
-	for _, analyst := range anaylsts {
+	analystList, err := financialAnalystDao.GetAnalystList(pageInfo.LatestId, offset, pageInfo.PageSize)
+	for _, analyst := range analystList {
 		analystsDTO = append(analystsDTO, convertToBaseDTO(analyst))
 	}
 	return
@@ -34,7 +34,7 @@ func GetAnalystById(id int) (financialAnalyst FinancialAnalystDTO, err error) {
 	financialAnalyst = convertToBaseDTO(analyst)
 	return
 }
-func GetCount() (total int64) {
+func GetCount() (total int64, latestId int64) {
 	return financialAnalystDao.GetCount()
 }
 func GetAnalystByName(name string) (financialAnalyst FinancialAnalystDTO, err error) {

models/financial_analyst/financial_analyst.go

@@ -59,11 +59,17 @@ func GetAnalystByName(name string) (analyst CrmFinancialAnalyst, err error) {
 	return
 }
 
-func GetCount() (total int64) {
+func GetCount() (total int64, latestId int64) {
 	db := models.Main()
 	err := db.Model(&CrmFinancialAnalyst{}).Select("count(*) count").Scan(&total).Order("id asc").Error
 	if err != nil {
-		return 0
+		logger.Error("查询研究员列表失败，%v", err)
+		return 0, 0
+	}
+	err = db.Model(&CrmFinancialAnalyst{}).Select("MAX(id) id").Scan(&latestId).Order("id asc").Error
+	if err != nil {
+		logger.Error("查询研究员列表失败，%v", err)
+		return 0, 0
 	}
 	return
 }
@@ -79,6 +85,6 @@ func GetAnalystList(latestId int64, offset int, limit int) (analysts []CrmFinanc
 		logger.Error("非法的limit参数:%d", limit)
 	}
 	db := models.Main()
-	err = db.Select(columns).Where(" id<= ? ", latestId).Offset(offset).Limit(limit).Find(&analysts).Order("create_time desc").Error
+	err = db.Select(columns).Where(" id<= ? ", latestId).Offset(offset).Limit(limit).Find(&analysts).Order("created_time desc").Error
 	return
 }

service/analyst/analyst_service.go

@@ -17,7 +17,7 @@ type Analyst struct {
 	Following    string `json:"following"`
 }
 
-func GetAnalystCount() (total int64) {
+func GetAnalystCount() (total int64, latestId int64) {
 	return analystService.GetCount()
 }