|
|
@@ -1135,7 +1135,7 @@ type TimeLineReportItem struct {
|
|
|
SubCategoryName string `description:"二级分类"`
|
|
|
IsRed bool `description:"是否标红"`
|
|
|
Readnum int `description:"阅读数量"`
|
|
|
- Resource int `description:"来源类型，1：文章、2：产品内测、3：晨报点评"`
|
|
|
+ Resource int `description:"来源类型，1：文章、2：产品内测、3：晨报点评 4:活动回放"`
|
|
|
}
|
|
|
|
|
|
// 获取产业报告+晨会点评列表
|
|
|
@@ -1192,7 +1192,22 @@ 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 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.ca.activity_id
|
|
|
+ WHERE
|
|
|
+ cam.industrial_management_id = ? AND cam.source = 1
|
|
|
) AS t
|
|
|
`
|
|
|
sql += ` ORDER BY
|
ziwen