6.5研选类型修改

controllers/home.go

@@ -460,9 +460,9 @@ func (this *HomeController) ListHomeArtAndChart() {
 			page = paging.GetPaging(currentIndex, pageSize, total)
 			if categoryId != "" {
 				condition += ` AND category_id IN(` + categoryId + `)`
-				condition += ` OR ( category_name  LIKE '%` + categoryinfo.PermissionName + `%' AND publish_status = 1 AND is_summary = 1 )`
+				condition += ` OR ( category_name  LIKE '%研选` + `%' AND publish_status = 1 AND is_summary = 1 )`
 			} else {
-				condition += ` AND  category_name   LIKE '%` + categoryinfo.PermissionName + `%'`
+				condition += ` AND  category_name   LIKE '%研选` + `%'`
 			}
 		}
 		//永续客户无法查看研选分类的内容

controllers/report.go

@@ -1408,6 +1408,12 @@ func (this *ReportController) ResearchDetail() {
 		br.ErrMsg = "获取子类信息失败，Err:" + err.Error()
 		return
 	}
+	listArticleType, err := models.GetCygxArticleTypeList()
+	if err != nil {
+		br.Msg = "获取失败"
+		br.ErrMsg = "获取文章类型数据失败，Err:" + err.Error()
+		return
+	}
 	for k, v := range listFirst {
 		listSecond, err := models.GetResearchSummarylogSonListSecond(articleId, v.Type)
 		if err != nil && err.Error() != utils.ErrNoRow() {
@@ -1422,13 +1428,19 @@ func (this *ReportController) ResearchDetail() {
 				br.ErrMsg = "获取信息失败,Err:" + err.Error()
 				return
 			}
-			if v2.ChartPermissionId == utils.YanxSummaryPermissionId {
-				listSecond[k2].IcoLink = "https://hongze.oss-cn-shanghai.aliyuncs.com/static/images/202111/20211104/QbTGTNhD9MxYp24cJ7V5WpCN0oNl.png"
-				listSecond[k2].PermissionName = "研选纪要"
-			} else if v2.ChartPermissionId == utils.YanxViewpointPermissionId {
-				listSecond[k2].IcoLink = "https://hongze.oss-cn-shanghai.aliyuncs.com/static/images/202111/20211104/QbTGTNhD9MxYp24cJ7V5WpCN0oNl.png"
-				listSecond[k2].PermissionName = "研选观点"
+			for _, vType := range listArticleType {
+				if v2.ChartPermissionId == vType.YanxPermissionId {
+					listSecond[k2].IcoLink = vType.IcoLink
+					listSecond[k2].PermissionName = vType.ArticleTypeName
+				}
 			}
+			//if v2.ChartPermissionId == utils.YanxSummaryPermissionId {
+			//	listSecond[k2].IcoLink = "https://hongze.oss-cn-shanghai.aliyuncs.com/static/images/202111/20211104/QbTGTNhD9MxYp24cJ7V5WpCN0oNl.png"
+			//	listSecond[k2].PermissionName = "买方研选纪要"
+			//} else if v2.ChartPermissionId == utils.YanxViewpointPermissionId {
+			//	listSecond[k2].IcoLink = "https://hongze.oss-cn-shanghai.aliyuncs.com/static/images/202111/20211104/QbTGTNhD9MxYp24cJ7V5WpCN0oNl.png"
+			//	listSecond[k2].PermissionName = "买方研选观点"
+			//}
 			if len(listThird) > 0 {
 				for k3, v3 := range listThird {
 					if v3.VideoUrl != "" {
@@ -1461,7 +1473,7 @@ func (this *ReportController) ResearchDetail() {
 			listFirst[k].ListName = "事件点评"
 			listFirst[k].IcoLink = "https://hongze.oss-cn-shanghai.aliyuncs.com/static/images/202110/20211020/2a5cXafO3Iws4QcFp1bd5WPdYikV.png"
 		} else if v.Type == "YANX" {
-			listFirst[k].ListName = "研选"
+			listFirst[k].ListName = "买方研选"
 			listFirst[k].IcoLink = "https://hongze.oss-cn-shanghai.aliyuncs.com/static/images/202111/20211104/QbTGTNhD9MxYp24cJ7V5WpCN0oNl.png"
 		}
 	}
@@ -1583,7 +1595,7 @@ func (this *ReportController) MinutesDetailV4() {
 			listFirst[k].ListName = "上市公司调研纪要篇"
 			listFirst[k].IcoLink = "https://hongze.oss-cn-shanghai.aliyuncs.com/static/images/202111/20211101/ujHXB48I8ay9T0XoPRI7lorz7OkL.png"
 		} else if v.Type == "YANX" {
-			listFirst[k].ListName = "研选纪要"
+			listFirst[k].ListName = "买方研选纪要"
 			listFirst[k].IcoLink = "https://hongze.oss-cn-shanghai.aliyuncs.com/static/images/202111/20211104/QbTGTNhD9MxYp24cJ7V5WpCN0oNl.png"
 		}
 	}

models/article.go

@@ -611,3 +611,23 @@ WHERE
 	err = o.Raw(sql).QueryRow(&articleid)
 	return
 }
+
+type CygxArticleType struct {
+	ArticleTypeId      int       `orm:"column(article_type_id);pk";description:"文章类型ID"`
+	ArticleTypeName    string    `description:"类型名称"`
+	Sort               int       `description:"排序字段"`
+	CreateTime         time.Time `description:"创建时间"`
+	ModifyTime         time.Time `description:"最后修改时间"`
+	IsSendEs           int       `description:"这种报告类型是否同步到Es"`
+	YanxPermissionId   int       `description:"研选类型所对应的ID"`
+	YanxPermissionName string    `description:"研选类型所对应的名称"`
+	IcoLink            string    `description:"图标链接地址"`
+}
+
+//报告类型列表
+func GetCygxArticleTypeList() (items []*CygxArticleType, err error) {
+	o := orm.NewOrm()
+	sql := `SELECT * FROM cygx_article_type ORDER BY sort DESC`
+	_, err = o.Raw(sql).QueryRows(&items)
+	return
+}