Browse Source

no message

xingzai 2 years ago
parent
commit
82eb3dce8b
2 changed files with 6 additions and 27 deletions
  1. 5 27
      controllers/report.go
  2. 1 0
      models/article.go

+ 5 - 27
controllers/report.go

@@ -473,41 +473,19 @@ func (this *ReportController) List() {
 			imgUrlChartPermission = vslice[len(vslice)-1]
 			mapChartPermission[permissionName] = imgUrlChartPermission
 		}
-		var condition string
-		//var pars []interface{}
-		//
-		if detail.PolymerizationId != "" {
-			condition = ` AND category_id IN(` + detail.PolymerizationId + `)`
-		} else {
-			condition = ` AND category_id IN(` + strconv.Itoa(categoryId) + `)`
-		}
-
-		total, err = models.GetHomeCount(condition, pars)
+		total, err = models.GetReportIndustrialCount(categoryId, industrialManagementId)
 		if err != nil {
 			br.Msg = "获取信息失败"
-			br.Msg = "获取帖子总数失败,Err:" + err.Error()
+			br.ErrMsg = "获取帖子总数失败,Err:" + err.Error()
 			return
 		}
-		list, err := models.GetHomeList(condition, pars, startSize, pageSize)
+		page = paging.GetPaging(currentIndex, pageSize, total)
+		list, err := models.GetReportIndustrialList(pars, categoryId, industrialManagementId, uid, startSize, pageSize)
 		if err != nil {
 			br.Msg = "获取信息失败"
-			br.Msg = "获取帖子数据失败,Err:" + err.Error()
+			br.ErrMsg = "获取帖子数据失败,Err:" + err.Error()
 			return
 		}
-
-		//total, err = models.GetReportIndustrialCount(categoryId, industrialManagementId)
-		//if err != nil {
-		//	br.Msg = "获取信息失败"
-		//	br.ErrMsg = "获取帖子总数失败,Err:" + err.Error()
-		//	return
-		//}
-		page = paging.GetPaging(currentIndex, pageSize, total)
-		//list, err := models.GetReportIndustrialList(pars, categoryId, industrialManagementId, uid, startSize, pageSize)
-		//if err != nil {
-		//	br.Msg = "获取信息失败"
-		//	br.ErrMsg = "获取帖子数据失败,Err:" + err.Error()
-		//	return
-		//}
 		//对应分类的所图片
 		detailCategoryUrl, err := models.GetConfigByCode("category_map_img_url")
 		if err != nil {

+ 1 - 0
models/article.go

@@ -110,6 +110,7 @@ type HomeArticle struct {
 	ArticleTypeName     string               `description:"权限名称"`
 	IsReport            int                  `description:"是否属于报告,1是,0否"`
 	ArticleResponse     int                  `description:"报告类型 0:啥也不是,1研选报告,2:研选纪要,3:研选沙龙,4;研选观点"`
+	Readnum             int                  `description:"阅读数量"`
 	List                []*IndustrialManagementIdInt
 }