|
|
@@ -1130,12 +1130,13 @@ type TimeLineReportItem struct {
|
|
|
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:活动回放"`
|
|
|
+ Resource int `description:"来源类型，1：文章、2：产品内测、3：晨报点评 4:活动回放视频 5:活动回放音频 "`
|
|
|
}
|
|
|
|
|
|
// 获取产业报告+晨会点评列表
|
|
|
@@ -1206,6 +1207,21 @@ FROM
|
|
|
cygx_activity AS ca
|
|
|
INNER JOIN cygx_activity_video AS cav ON ca.activity_id = cav.activity_id
|
|
|
INNER JOIN cygx_industrial_activity_group_management AS cam ON ca.activity_id=cam.activity_id
|
|
|
+ WHERE
|
|
|
+ cam.industrial_management_id = ? AND cam.source = 1 UNION ALL
|
|
|
+ SELECT
|
|
|
+ ca.activity_id AS id,
|
|
|
+ cavo.voice_name AS title,
|
|
|
+ ca.activity_time AS publish_time,
|
|
|
+ cavo.voice_name AS voice_url,
|
|
|
+ '' AS sub_category_name,
|
|
|
+ '' AS content,
|
|
|
+ 5 AS resource,
|
|
|
+ ( 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
|
|
|
+ INNER JOIN cygx_activity_voice AS cavo ON ca.activity_id = cavo.activity_id
|
|
|
+ INNER JOIN cygx_industrial_activity_group_management AS cam ON ca.activity_id=cam.activity_id
|
|
|
WHERE
|
|
|
cam.industrial_management_id = ? AND cam.source = 1
|
|
|
) AS t
|
ziwen