浏览代码

策略展示核心观点

xingzai 2 年之前
父节点
当前提交
d0d5847c8f
共有 4 个文件被更改,包括 20 次插入7 次删除
  1. 17 7
      controllers/tactics.go
  2. 1 0
      models/activity.go
  3. 1 0
      models/article.go
  4. 1 0
      services/activity.go

+ 17 - 7
controllers/tactics.go

@@ -134,13 +134,6 @@ func (this *TacticsController) List() {
 		br.Msg = "获取帖子数据失败,Err:" + err.Error()
 		br.Msg = "获取帖子数据失败,Err:" + err.Error()
 		return
 		return
 	}
 	}
-	lenList := len(list)
-	for i := 0; i < lenList; i++ {
-		item := list[i]
-		list[i].Body, _ = services.GetReportContentTextSub(item.Body)
-		//list[i].Abstract = html.UnescapeString(item.Abstract)
-		list[i].Abstract, _ = services.GetReportContentTextSub(item.Abstract)
-	}
 
 
 	for k, v := range list {
 	for k, v := range list {
 		if v.Readnum == 0 && user.CreatedTime.Before(utils.StrTimeToTime(v.PublishDate)) && utils.StrTimeToTime(utils.OnlineTime).Before(utils.StrTimeToTime(v.PublishDate)) {
 		if v.Readnum == 0 && user.CreatedTime.Before(utils.StrTimeToTime(v.PublishDate)) && utils.StrTimeToTime(utils.OnlineTime).Before(utils.StrTimeToTime(v.PublishDate)) {
@@ -157,6 +150,23 @@ func (this *TacticsController) List() {
 		}
 		}
 		resp.MatchTypeName = detail.MatchTypeName
 		resp.MatchTypeName = detail.MatchTypeName
 	}
 	}
+	lenList := len(list)
+	for i := 0; i < lenList; i++ {
+		item := list[i]
+		list[i].Body, _ = services.GetReportContentTextSub(item.Body)
+		list[i].Abstract = html.UnescapeString(item.Abstract)
+		//list[i].Abstract, _ = services.GetReportContentTextSub(item.Abstract)
+		list[i].Annotation = strings.Replace(item.Annotation, "<br>", "", -1)
+		//行业比较研究、资金流向,显示报告的摘要
+		if resp.MatchTypeName == "行业比较研究" || resp.MatchTypeName == "资金流向" {
+			list[i].Annotation = list[i].Abstract
+		}
+		//if item.ArticleId == 6881 {
+		//	fmt.Println(list[i].Annotation)
+		//}
+		list[i].Abstract, _ = services.GetReportContentTextSub(item.Abstract)
+	}
+
 	resp.CategoryImgUrlPc = mapChartPermission[detail.ChartPermissionName]
 	resp.CategoryImgUrlPc = mapChartPermission[detail.ChartPermissionName]
 	resp.List = list
 	resp.List = list
 	resp.Paging = page
 	resp.Paging = page

+ 1 - 0
models/activity.go

@@ -178,6 +178,7 @@ type ActivityDetail struct {
 	IsShowMeetingReminder   bool                       `description:"是否展示会议提醒"`
 	IsShowMeetingReminder   bool                       `description:"是否展示会议提醒"`
 	IsShowHelpSsk           bool                       `description:"是否展示帮我带问"`
 	IsShowHelpSsk           bool                       `description:"是否展示帮我带问"`
 	IsShowSignup            bool                       `description:"是否展示我要报名"`
 	IsShowSignup            bool                       `description:"是否展示我要报名"`
+	IsShowDetails           bool                       `description:"是否展示查看详情按钮"`
 	TemporaryLabel          string                     `description:"临时标签"`
 	TemporaryLabel          string                     `description:"临时标签"`
 	IsCanAppointmentMinutes int                        `description:"是否可预约纪要 1是 ,0 否 默认0 "`
 	IsCanAppointmentMinutes int                        `description:"是否可预约纪要 1是 ,0 否 默认0 "`
 	YidongActivityId        string                     `description:"易董活动ID"`
 	YidongActivityId        string                     `description:"易董活动ID"`

+ 1 - 0
models/article.go

@@ -372,6 +372,7 @@ type ReportArticle struct {
 	IsHaveVideo      bool   `description:"是否含有音频文件"`
 	IsHaveVideo      bool   `description:"是否含有音频文件"`
 	ImgUrlPc         string `description:"图片链接"`
 	ImgUrlPc         string `description:"图片链接"`
 	CategoryId       string `description:"文章分类"`
 	CategoryId       string `description:"文章分类"`
+	Annotation       string `description:"核心观点"`
 }
 }
 
 
 func GetReportPermission(categoryName string) (item []*ChartPermission, err error) {
 func GetReportPermission(categoryName string) (item []*ChartPermission, err error) {

+ 1 - 0
services/activity.go

@@ -1339,6 +1339,7 @@ func ActivityButtonShow(item *models.ActivityDetail) (articleDetail *models.Acti
 	//易董的操作按钮都隐藏
 	//易董的操作按钮都隐藏
 	if articleDetail.YidongActivityId != "" {
 	if articleDetail.YidongActivityId != "" {
 		articleDetail.IsShowSignup = false
 		articleDetail.IsShowSignup = false
+		articleDetail.IsShowDetails = true
 		return
 		return
 	}
 	}
 	//新的是否展示规则
 	//新的是否展示规则