|
|
@@ -601,6 +601,7 @@ type TimeLineReportItem struct {
|
|
|
SubCategoryName string `description:"二级分类"`
|
|
|
IsRed bool `description:"是否标红"`
|
|
|
Readnum int `description:"阅读数量"`
|
|
|
+ Resource int `description:"来源类型，1：文章、2：产品内测、3：晨报点评 4:活动回放"`
|
|
|
}
|
|
|
|
|
|
// 获取产业报告+晨会点评列表
|
|
|
@@ -641,7 +642,22 @@ FROM
|
|
|
WHERE
|
|
|
mm.id = mmc.meeting_id
|
|
|
AND mm.STATUS = 1
|
|
|
- AND mmc.industry_id = ?
|
|
|
+ AND mmc.industry_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 sub_category_name,
|
|
|
+ '' AS content,
|
|
|
+ 4 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_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
|
|
|
) AS t`
|
|
|
totalSql := `SELECT COUNT(1) total FROM (` + sql + `) z `
|
|
|
err = o.Raw(totalSql, industrialManagementId, industrialManagementId).QueryRow(&total)
|
ziwen