no message

controllers/research.go

@@ -155,9 +155,9 @@ func (this *MobileResearchController) ArticleNewList() {
 			List:            v.List,
 		}
 		if item.ArticleTypeName == "纪要" || item.ArticleTypeName == "沙龙" || item.ArticleTypeName == "专家访谈" {
-			item.Annotation = "核心观点：" + item.Annotation
-		} else {
 			item.Annotation = "核心结论：" + item.Annotation
+		} else {
+			item.Annotation = "核心观点：" + item.Annotation
 		}
 
 		resp.List = append(resp.List, &item)

models/report.go

@@ -702,7 +702,7 @@ func GetThemeHeatList(userId int, condition, conditionOrder string, startSize, p
           	MAX( a.publish_date ) AS publish_date,
 			MIN(a.publish_date) AS min_report_time,
 			( 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,
-			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  ) AND DATE_SUB( CURDATE(), INTERVAL 30 DAY ) <= date( la.activity_time ) ) AS sum_num
+			m.yanxu_article_read_num + m.activity_num 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