Merge branch 'cygx_9.0' of http://8.136.199.33:3000/hongze/hongze_cygx into debug

controllers/report.go

@@ -2664,7 +2664,7 @@ func (this *ReportController) SearchReportAndResource() {
 			ListYxReport[k].IsCollect = true
 		}
 	}
-	ListHzReport, err := models.GetReoprtSearchList(` AND a.article_id < 1000000 `+condition+` OR ( article_type = 'lyjh' `+condition+` ) `+sqlGroup, user.UserId)
+	ListHzReport, err := models.GetReoprtSearchList(` AND a.article_id < 1000000 `+condition+` OR ( article_type = 'lyjh' `+condition+` ) OR ( a.sub_category_name = '专项调研' `+condition+` )  `+sqlGroup, user.UserId)
 	if err != nil {
 		br.Msg = "获取信息失败"
 		br.ErrMsg = "获取文章列表失败,Err:" + err.Error()

services/article.go

@@ -11,6 +11,7 @@ import (
 	"hongze/hongze_cygx/utils"
 	"html"
 	"net/url"
+	"regexp"
 	"sort"
 	"strconv"
 	"strings"
@@ -1732,10 +1733,11 @@ func HandleArticleCategoryImg(list []*models.HomeArticle) (items []*models.HomeA
 		} else {
 			list[k].ImgUrlPc = mapCategoryUrl[v.CategoryId]
 		}
-		//ArticleResponse     int                  `description:"报告类型 0：啥也不是，1研选报告，2：研选纪要，3：研选沙龙，4;研选观点"`
+		//ArticleResponse     int                  `description:"报告类型 0：啥也不是，1研选报告，2：研选纪要，3：研选沙龙，4;核心观点"`
 		if list[k].ArticleId >= utils.SummaryArticleId {
 			list[k].HttpUrl = utils.StrategyPlatform + strconv.Itoa(v.ArticleId)
 			list[k].IsNeedJump = true
+			list[k].ArticleResponse = 4 //  默认展示核心观点
 			if v.IsReport == 1 {
 				list[k].ArticleResponse = 1
 			} else if v.ArticleTypeName == "纪要" {
@@ -1807,6 +1809,10 @@ func HandleArticleCategoryImg(list []*models.HomeArticle) (items []*models.HomeA
 
 //处理核心观点的展示规则
 func ArticleAnnotation(item *models.HomeArticle) (annotation string) {
+
+	if item.ArticleId >= utils.SummaryArticleId {
+		item.Annotation = YxArticleAnnotation(item)
+	}
 	if item.Annotation != "" {
 		annotation = strings.Replace(item.Annotation, "<br>", "", -1)
 	} else {
@@ -1857,3 +1863,46 @@ func ArticleAnnotation(item *models.HomeArticle) (annotation string) {
 	}
 	return
 }
+
+//解析研选内容中的核心观点
+func YxArticleAnnotation(article *models.HomeArticle) (annotation string) {
+	body := strings.ReplaceAll(article.Body, "<strong>", "")
+	body = strings.ReplaceAll(body, "</strong>", "")
+	body = strings.ReplaceAll(body, "</ol>", "</div>")
+	body = strings.ReplaceAll(body, "<ol>", "<div>")
+	body = strings.ReplaceAll(body, "</li>", "</p>")
+	body = strings.ReplaceAll(body, "<li>", "<p>")
+	re, _ := regexp.Compile("<strong.*?>")
+	body = re.ReplaceAllString(body, "")
+	reLi, _ := regexp.Compile("<li.*?>")
+	body = reLi.ReplaceAllString(body, "")
+	var plus int
+	coreIndex := strings.Index(body, "核心观点：")
+	plus = 15
+	if coreIndex == -1 {
+		coreIndex = strings.Index(body, "核心观点:")
+		plus = 13
+	}
+	if coreIndex == -1 {
+		coreIndex = strings.Index(body, "核心观点")
+		plus = 12
+	}
+	if coreIndex == -1 {
+		coreIndex = strings.Index(body, "核心结论：")
+		plus = 15
+	}
+	if coreIndex == -1 {
+		coreIndex = strings.Index(body, "核心结论:")
+		plus = 13
+	}
+	if coreIndex == -1 {
+		coreIndex = strings.Index(body, "核心结论")
+		plus = 12
+	}
+	endIndex := strings.Index(body, "<hr")
+	if coreIndex != -1 && endIndex != -1 {
+		body = body[coreIndex+plus : endIndex]
+	}
+	annotation = body
+	return
+}