足迹收藏，研选来源判断

controllers/user.go

@@ -469,10 +469,15 @@ func (this *UserController) CollectList() {
 		list[i].Title = article.Title
 		list[i].DepartmentId = article.DepartmentId
 		list[i].NickName = article.NickName
+		list[i].PublishDate = article.PublishDate
+		if article.ArticleId < utils.SummaryArticleId {
+			list[i].Source = 1
+		} else {
+			list[i].Source = 2
+		}
 		//list[i].TitleEn = article.TitleEn
 		//list[i].UpdateFrequency = article.UpdateFrequency
 		//list[i].CreateDate = article.CreateDate
-		list[i].PublishDate = article.PublishDate
 		//list[i].Body, _ = services.GetReportContentTextSub(article.Body)
 		//list[i].Abstract = article.Abstract
 		//list[i].CategoryName = article.CategoryName
@@ -669,6 +674,11 @@ func (this *UserController) BrowseHistoryList() {
 			list[i].PublishDate = article.PublishDate
 			list[i].DepartmentId = article.DepartmentId
 			list[i].NickName = article.NickName
+			if article.ArticleId < utils.SummaryArticleId {
+				list[i].Source = 1
+			} else {
+				list[i].Source = 2
+			}
 			//list[i].TitleEn = article.TitleEn
 			//list[i].UpdateFrequency = article.UpdateFrequency
 			//list[i].CreateDate = article.CreateDate

models/report.go

@@ -307,10 +307,10 @@ type ArticleCollectionResp struct {
 	IndustryName           string `description:"产业名称"`
 	DepartmentId           int    `description:"作者Id"`
 	NickName               string `description:"作者昵称"`
-	Pv                     int    `description:"PV"`
-	CollectNum             int    `description:"收藏人数"`
 	MyCollectNum           int    `description:"本人是否收藏"`
 	IsCollect              bool   `description:"本人是否收藏"`
+	Pv                     int    `description:"PV"`
+	CollectNum             int    `description:"收藏人数"`
 	Source                 int    `description:"来源 1:弘则资源包（报告）、2：研选主题（报告）"`
 }
 
@@ -697,6 +697,10 @@ type ArticleReportBillboardResp struct {
 	PublishDate  string `description:"发布时间"`
 	DepartmentId int    `description:"作者Id"`
 	NickName     string `description:"作者昵称"`
+	IsCollect    bool   `description:"本人是否收藏"`
+	Pv           int    `description:"PV"`
+	CollectNum   int    `description:"收藏人数"`
+	Source       int    `description:"来源 1:弘则资源包（报告）、2：研选主题（报告）"`
 	List         []*IndustrialManagementIdInt
 }