ziwen 1 year ago
parent
commit
380aafee4c
1 changed files with 18 additions and 12 deletions
  1. 18 12
      models/report.go

+ 18 - 12
models/report.go

@@ -1125,18 +1125,19 @@ WHERE
 }
 
 type TimeLineReportItem struct {
-	Id              int    `description:"文章或晨报点评id"`
-	Title           string `description:"标题"`
-	PublishTime     string `description:"发布时间"`
-	Content         string `description:"内容"`
-	VideoUrl        string `description:"视频链接"`
-	VoiceUrl        string `description:"音频链接"`
-	IsHaveVideo     bool   `description:"是否包含视频"`
-	ImgUrlPc        string `description:"pc图片"`
-	SubCategoryName string `description:"二级分类"`
-	IsRed           bool   `description:"是否标红"`
-	Readnum         int    `description:"阅读数量"`
-	Resource        int    `description:"来源类型,1:文章、2:产品内测、3:晨报点评 4:活动回放视频 5:活动回放音频 "`
+	Id               int    `description:"文章或晨报点评id"`
+	Title            string `description:"标题"`
+	PublishTime      string `description:"发布时间"`
+	Content          string `description:"内容"`
+	VideoUrl         string `description:"视频链接"`
+	VoiceUrl         string `description:"音频链接"`
+	VoicePlaySeconds string `description:"音频时长"`
+	IsHaveVideo      bool   `description:"是否包含视频"`
+	ImgUrlPc         string `description:"pc图片"`
+	SubCategoryName  string `description:"二级分类"`
+	IsRed            bool   `description:"是否标红"`
+	Readnum          int    `description:"阅读数量"`
+	Resource         int    `description:"来源类型,1:文章、2:产品内测、3:晨报点评 4:活动回放视频 5:活动回放音频 "`
 }
 
 // 获取产业报告+晨会点评列表
@@ -1155,6 +1156,7 @@ FROM
 		a.sub_category_name,
 		'' AS content,
 		1 AS resource,
+		'' AS voice_play_seconds,
 		( 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
@@ -1172,6 +1174,7 @@ FROM
 		'时间线' AS sub_category_name,
 		mmc.content,
 		3 AS resource,
+	'' AS voice_play_seconds,
 		0  AS readnum 
 	FROM
 		cygx_morning_meeting_review_chapter AS mmc
@@ -1189,6 +1192,7 @@ FROM
 		'' AS sub_category_name,
 		'' AS content,
 		2 AS resource,
+		'' AS voice_play_seconds,
 		0 AS readnum 
 	FROM
 		cygx_product_interior AS p
@@ -1206,6 +1210,7 @@ FROM
 		'' AS sub_category_name,
 		'' AS content,
 		4 AS resource,
+		'' AS voice_play_seconds,
 		( SELECT COUNT( 1 ) FROM cygx_activity_video_history AS rec WHERE rec.user_id = ` + strconv.Itoa(userId) + ` AND rec.activity_id = ca.activity_id ) AS readnum 
 	FROM 
 		cygx_activity AS ca 
@@ -1222,6 +1227,7 @@ FROM
 		'' AS sub_category_name,
 		'' AS content,
 		5 AS resource,
+		cavo.voice_play_seconds AS voice_play_seconds,
 		( SELECT COUNT( 1 ) FROM cygx_activity_voice_history AS rec WHERE rec.user_id = ` + strconv.Itoa(userId) + ` AND rec.activity_id = ca.activity_id ) AS readnum 
 	FROM 
 		cygx_activity AS ca