Browse Source

需求池 处理研选下面的路演精华 的报告链接是否跳转

xingzai 2 years ago
parent
commit
ae0d1aed04
3 changed files with 67 additions and 21 deletions
  1. 13 0
      controllers/article.go
  2. 3 21
      models/article.go
  3. 51 0
      models/article_type.go

+ 13 - 0
controllers/article.go

@@ -337,6 +337,19 @@ Loop:
 		detail.IsNeedJump = true
 	}
 
+	// 处理研选下面的路演精华 的报告链接是否跳转
+	if hasPermission == 1 && detail.ArticleId > utils.SummaryArticleId && detail.ArticleTypeId > 0 {
+		articleTYpeDetail, err := models.GetArticleTypeInfo(detail.ArticleTypeId)
+		if err != nil && err.Error() != utils.ErrNoRow() {
+			br.Msg = "获取信息失败"
+			br.ErrMsg = "获取销售信息失败,Err:" + err.Error()
+			return
+		}
+		if articleTYpeDetail != nil {
+			detail.IsShowLinkButton = articleTYpeDetail.IsShowLinkButton
+		}
+		detail.PublishDate = utils.TimeRemoveHms2(detail.PublishDate)
+	}
 	resp := new(models.ArticleDetailResp)
 	resp.HasPermission = hasPermission
 	resp.HaveResearch = haveResearch

+ 3 - 21
models/article.go

@@ -147,6 +147,9 @@ type ArticleDetail struct {
 	SellerList              []*SellerRep
 	HttpUrl                 string `description:"文章链接跳转地址"`
 	IsNeedJump              bool   `description:"是否需要跳转链接地址"`
+	ReportLink              string `description:"报告链接"`
+	IsShowLinkButton        int    `description:"这种报告类型是否展示查看报告链接"`
+	ArticleTypeId           int    `description:"文章类型ID"`
 }
 
 type ArticleDetailFileLink struct {
@@ -626,27 +629,6 @@ WHERE
 	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:"图标链接地址"`
-	IcoLinkM           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
-}
-
 //通过文章ID获取文章所关联的标的ID
 func GetSubjectIds(articleId int) (subjects string, err error) {
 	sql := ` SELECT

+ 51 - 0
models/article_type.go

@@ -0,0 +1,51 @@
+package models
+
+import (
+	"github.com/beego/beego/v2/client/orm"
+	"time"
+)
+
+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:"图标链接地址"`
+	IcoLinkM           string    `description:"移动端图标链接地址"`
+	IsShowLinkButton   int       `description:"这种报告类型是否展示查看报告链接"`
+}
+
+//详情
+func GetCygxArticleTypeDetailById(activityTypeId int) (item *CygxArticleType, err error) {
+	o := orm.NewOrm()
+	sql := `SELECT * FROM cygx_article_type WHERE article_type_id = ? `
+	err = o.Raw(sql, activityTypeId).QueryRow(&item)
+	return
+}
+
+//获取数量
+func GetCygxArticleTypeCount(condition string) (count int, err error) {
+	o := orm.NewOrm()
+	sqlCount := `SELECT COUNT(1) AS count  FROM cygx_article_type WHERE  1=1 ` + condition
+	err = o.Raw(sqlCount).QueryRow(&count)
+	return
+}
+
+//报告类型列表
+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
+}
+
+func GetArticleTypeInfo(activityTypeId int) (item *CygxArticleType, err error) {
+	o := orm.NewOrm()
+	sql := `SELECT * FROM cygx_article_type   WHERE  article_type_id=? `
+	err = o.Raw(sql, activityTypeId).QueryRow(&item)
+	return
+}