Merge branch 'cygx_5.0' of http://8.136.199.33:3000/hongze/hongze_cygx into debug

controllers/research.go

@@ -44,14 +44,20 @@ func (this *ResearchController) NewList() {
 		br.ErrMsg = "获取品种信息失败,Err:" + err.Error()
 		return
 	}
-	detailHot3, err := models.GetIndustrialManagementHot3(chartPermissionId)
+	mapHot := make(map[string]int)
+
+	condition := ` ORDER BY sum_num DESC LIMIT 15 `
+	listHot, err := models.GetThemeHeatList(categoryinfo.PermissionName, user.UserId, condition)
 	if err != nil {
 		br.Msg = "获取信息失败"
-		br.ErrMsg = "获取信息失败,Err:" + err.Error()
+		br.ErrMsg = "获取品种信息失败,Err:" + err.Error()
 		return
 	}
+	for _, v := range listHot {
+		mapHot[v.IndustryName] = v.IndustrialManagementId
+	}
 	for k, v := range list {
-		if v.ArticleReadNum >= detailHot3.ArticleReadNum {
+		if mapHot[v.IndustryName] > 0 {
 			list[k].IsHot = true
 		}
 	}
@@ -172,12 +178,18 @@ func (this *ResearchController) HotList() {
 		br.ErrMsg = "获取标的信息失败,Err:" + err.Error()
 		return
 	}
-	detailHot3, err := models.GetIndustrialManagementHot3(chartPermissionId)
+	mapHot := make(map[string]int)
+
+	condition = ` ORDER BY sum_num DESC LIMIT 15 `
+	listHot, err := models.GetThemeHeatList(categoryinfo.PermissionName, user.UserId, condition)
 	if err != nil {
 		br.Msg = "获取信息失败"
-		br.ErrMsg = "获取信息失败,Err:" + err.Error()
+		br.ErrMsg = "获取品种信息失败,Err:" + err.Error()
 		return
 	}
+	for _, v := range listHot {
+		mapHot[v.IndustryName] = v.IndustrialManagementId
+	}
 	for k, v := range list {
 		if newMap[v.IndustrialManagementId] != "" {
 			list[k].IsNew = true
@@ -190,7 +202,7 @@ func (this *ResearchController) HotList() {
 				list[k].IndustrialSubjectList = append(list[k].IndustrialSubjectList, v2)
 			}
 		}
-		if v.ArticleReadNum >= detailHot3.ArticleReadNum {
+		if mapHot[v.IndustryName] > 0 {
 			list[k].IsHot = true
 		}
 	}

models/report.go

@@ -380,7 +380,7 @@ func GetThemeHeatList(permissionName string, userId int, condition string) (item
 			m.article_read_num,
             date_format(  MAX( a.publish_date ), '%Y-%m-%d' ) AS publish_date,	
 			( SELECT count( 1 ) FROM cygx_industry_fllow AS f  WHERE f.industrial_management_id = m.industrial_management_id  AND user_id =? AND f.type = 1  ) AS fllow_num,
-			( SELECT count( 1 ) FROM cygx_article_history_record_newpv AS h WHERE h.article_id IN  (SELECT article_id FROM cygx_industrial_article_group_management WHERE industrial_management_id = m.industrial_management_id )) + ( SELECT count( 1 ) FROM cygx_activity_meet_detail_log AS la  WHERE la.activity_id  IN  (SELECT activity_id FROM cygx_industrial_activity_group_management WHERE industrial_management_id = m.industrial_management_id  )) AS sum_num
+			m.article_read_num + ( SELECT count( 1 ) FROM cygx_activity_meet_detail_log AS la  WHERE la.activity_id  IN  (SELECT activity_id FROM cygx_industrial_activity_group_management WHERE industrial_management_id = m.industrial_management_id  )) AS sum_num
 		FROM
 			cygx_industrial_management AS m
 			LEFT JOIN cygx_industrial_article_group_management AS mg ON mg.industrial_management_id = m.industrial_management_id