|
|
@@ -424,8 +424,9 @@ func GetTimeLineReportIndustrialList(industrialManagementId, startSize, pageSize
|
|
|
}
|
|
|
|
|
|
type TimeLineReportItem struct {
|
|
|
- Id int `description:"文章或晨报点评id"`
|
|
|
- Title string `description:"标题"`
|
|
|
+ Id int `description:"文章或晨报点评id"`
|
|
|
+ ArticleId int `description:"文章id"`
|
|
|
+ Title string `description:"标题"`
|
|
|
//PublishTime string `description:"发布时间"`
|
|
|
PublishDate string `description:"发布时间"`
|
|
|
Content string `description:"内容"`
|
|
|
@@ -446,6 +447,7 @@ FROM
|
|
|
(
|
|
|
SELECT
|
|
|
a.article_id AS id,
|
|
|
+ a.article_id,
|
|
|
a.title,
|
|
|
a.publish_date,
|
|
|
a.video_url,
|
|
|
@@ -461,6 +463,7 @@ FROM
|
|
|
AND man_g.industrial_management_id = ? GROUP BY id UNION ALL
|
|
|
SELECT
|
|
|
mmc.id,
|
|
|
+ 0 as article_id,
|
|
|
mmc.content AS title,
|
|
|
mm.publish_time AS publish_date,
|
|
|
'' AS video_url,
|
xingzai