小红点fix

controllers/report.go

@@ -572,7 +572,7 @@ func (this *ReportController) List() {
 			return
 		}
 		page = paging.GetPaging(currentIndex, pageSize, total)
-		list, err := models.GetTimeLineReportIndustrialList(industrialManagementId, startSize, pageSize)
+		list, err := models.GetTimeLineReportIndustrialList(user.UserId, industrialManagementId, startSize, pageSize)
 		if err != nil {
 			br.Msg = "获取信息失败"
 			br.ErrMsg = "获取帖子数据失败，Err:" + err.Error()
@@ -605,9 +605,9 @@ func (this *ReportController) List() {
 		//}
 
 		for k, v := range list {
-			//if v.Readnum == 0 && user.CreatedTime.Before(utils.StrTimeToTime(v.PublishDate)) && utils.StrTimeToTime(utils.OnlineTime).Before(utils.StrTimeToTime(v.PublishDate)) {
-			//	list[k].IsRed = true
-			//}
+			if v.Readnum == 0 && user.CreatedTime.Before(utils.StrTimeToTime(v.PublishTime)) && utils.StrTimeToTime(utils.OnlineTime).Before(utils.StrTimeToTime(v.PublishTime)) {
+				list[k].IsRed = true
+			}
 			if v.VideoUrl != "" {
 				list[k].IsHaveVideo = true
 			}

models/report.go

@@ -405,7 +405,7 @@ type IndustrialManagementHotResp struct {
 	IsNew                  bool                  `description:"是否新标签"`
 	IsHot                  bool                  `description:"是否新标签"`
 	PublishDate            string                `description:"发布时间"`
-	MinReportTime          string               `description:"报告最早发布时间"`
+	MinReportTime          string                `description:"报告最早发布时间"`
 	ArticleReadNum         int                   `description:"文章阅读数量"`
 	Source                 int                   `description:"来源 1:弘则资源包（报告）、2：研选主题（报告）"`
 	IndustrialSubjectList  []*IndustrialSubject  `description:"标的列表"`
@@ -861,10 +861,12 @@ type TimeLineReportItem struct {
 	IsHaveVideo     bool   `description:"是否包含视频"`
 	ImgUrlPc        string `description:"pc图片"`
 	SubCategoryName string `description:"二级分类"`
+	IsRed           bool   `description:"是否标红"`
+	Readnum         int    `description:"阅读数量"`
 }
 
 //获取产业报告+晨会点评列表
-func GetTimeLineReportIndustrialList(industrialManagementId, startSize, pageSize int) (items []*TimeLineReportItem, err error) {
+func GetTimeLineReportIndustrialList(userId, industrialManagementId, startSize, pageSize int) (items []*TimeLineReportItem, err error) {
 	o := orm.NewOrm()
 	sql := `SELECT
 	* 
@@ -876,7 +878,8 @@ FROM
 		a.publish_date AS publish_time,
 		a.video_url,
 		a.sub_category_name,
-		'' AS content 
+		'' AS content,
+		( SELECT COUNT( 1 ) FROM cygx_article_history_record AS rec WHERE rec.user_id = ` + strconv.Itoa(userId) + ` AND rec.article_id = a.article_id ) AS readnum 
 	FROM
 		cygx_article AS a
 		INNER JOIN cygx_industrial_article_group_management AS man_g ON man_g.article_id = a.article_id 
@@ -890,7 +893,8 @@ FROM
 		mm.meeting_time AS publish_time,
 		'' AS video_url,
 		'时间线' AS sub_category_name,
-		mmc.content 
+		mmc.content,
+		0  AS readnum 
 	FROM
 		cygx_morning_meeting_review_chapter AS mmc
 		INNER JOIN cygx_morning_meeting_reviews AS mm 
@@ -907,7 +911,7 @@ FROM
 }
 
 type ArticleIdReq struct {
-	ArticleId  int `description:"文章id"`
-	PlaySeconds int `description:"播放时长"`
-	PageRouter string `description:"页面路径"`
-}
+	ArticleId   int    `description:"文章id"`
+	PlaySeconds int    `description:"播放时长"`
+	PageRouter  string `description:"页面路径"`
+}