|
@@ -1126,17 +1126,19 @@ WHERE
|
|
|
}
|
|
|
|
|
|
type TimeLineReportItem struct {
|
|
|
- Id int `description:"文章或晨报点评id"`
|
|
|
- Title string `description:"标题"`
|
|
|
- PublishTime string `description:"发布时间"`
|
|
|
- Content string `description:"内容"`
|
|
|
- VideoUrl string `description:"视频链接"`
|
|
|
- IsHaveVideo bool `description:"是否包含视频"`
|
|
|
- ImgUrlPc string `description:"pc图片"`
|
|
|
- SubCategoryName string `description:"二级分类"`
|
|
|
- IsRed bool `description:"是否标红"`
|
|
|
- Readnum int `description:"阅读数量"`
|
|
|
- Resource int `description:"来源类型,1:文章、2:产品内测、3:晨报点评"`
|
|
|
+ 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:活动回放音频 "`
|
|
|
}
|
|
|
|
|
|
// 获取产业报告+晨会点评列表
|
|
@@ -1151,9 +1153,11 @@ FROM
|
|
|
a.title,
|
|
|
a.publish_date AS publish_time,
|
|
|
a.video_url,
|
|
|
+ '' AS voice_url,
|
|
|
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
|
|
@@ -1167,9 +1171,11 @@ FROM
|
|
|
'' AS title,
|
|
|
mm.publish_time AS publish_time,
|
|
|
'' AS video_url,
|
|
|
+ '' AS voice_url,
|
|
|
'时间线' AS sub_category_name,
|
|
|
mmc.content,
|
|
|
3 AS resource,
|
|
|
+ '' AS voice_play_seconds,
|
|
|
0 AS readnum
|
|
|
FROM
|
|
|
cygx_morning_meeting_review_chapter AS mmc
|
|
@@ -1183,9 +1189,11 @@ FROM
|
|
|
p.title,
|
|
|
p.publish_time,
|
|
|
'' AS video_url,
|
|
|
+ '' AS voice_url,
|
|
|
'' AS sub_category_name,
|
|
|
'' AS content,
|
|
|
2 AS resource,
|
|
|
+ '' AS voice_play_seconds,
|
|
|
0 AS readnum
|
|
|
FROM
|
|
|
cygx_product_interior AS p
|
|
@@ -1193,12 +1201,46 @@ FROM
|
|
|
WHERE
|
|
|
p.product_interior_id = pm.product_interior_id
|
|
|
AND p.visible_range = 1
|
|
|
- AND pm.industrial_management_id = ?
|
|
|
+ AND pm.industrial_management_id = ? UNION ALL
|
|
|
+ SELECT
|
|
|
+ ca.activity_id AS id,
|
|
|
+ cav.video_name AS title,
|
|
|
+ ca.activity_time AS publish_time,
|
|
|
+ cav.video_url AS video_url,
|
|
|
+ '' AS voice_url,
|
|
|
+ '' 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
|
|
|
+ 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,
|
|
|
+ '' AS video_url,
|
|
|
+ cavo.voice_url AS voice_url,
|
|
|
+ '' 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
|
|
|
+ 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
|
|
|
`
|
|
|
sql += ` ORDER BY
|
|
|
t.publish_time DESC LIMIT ?,? `
|
|
|
- _, err = o.Raw(sql, industrialManagementId, industrialManagementId, industrialManagementId, startSize, pageSize).QueryRows(&items)
|
|
|
+ _, err = o.Raw(sql, industrialManagementId, industrialManagementId, industrialManagementId, industrialManagementId, industrialManagementId, startSize, pageSize).QueryRows(&items)
|
|
|
return
|
|
|
}
|
|
|
|