Merge branch 'cygx_13.8' of http://8.136.199.33:3000/hongze/hongze_cygx into debug

controllers/report.go

@@ -3113,6 +3113,9 @@ func (this *ReportController) SearchReportAndResource() {
 		v.Pv = articleMapPv[v.ArticleId]
 		v.CollectNum = articleCollectNumMap[v.ArticleId]
 		v.IsCollect = articleCollectMap[v.ArticleId]
+		if v.ReportId > 0 {
+			v.Resource = 3
+		}
 	}
 	for k, v := range ListYxReport {
 		if len(industrialMap[v.ArticleId]) > 0 {

models/report.go

@@ -518,6 +518,8 @@ type ArticleCollectionResp struct {
 	CompanyTags            string                      `description:"研选专栏公司标签"`
 	ArticleTypeName        string                      `description:"文章类型名称"`
 	TopTime                int                         `description:"置顶时间"`
+	ReportId               int                         `description:"FICC研报ID"`
+	Resource               int                         `description:"来源类型，1：文章、2：产品内测、3：FICC研报"`
 }
 
 type IndustrialManagementResp struct {
@@ -1202,6 +1204,7 @@ func GetReoprtSearchList(condition string, userId int) (items []*ArticleCollecti
 	o := orm.NewOrm()
 	sql := `SELECT
 			a.article_id,
+			a.report_id,
 			a.title,
 			date_format( a.publish_date, '%Y-%m-%d' ) AS publish_date,
 			m.industry_name,