no message

controllers/report.go

@@ -4026,13 +4026,24 @@ func (this *ReportController) ZhouqiTacticsList() {
 		return
 	}
 	var matchTypeName = []string{}
+	var seriesName = []string{}
 	for _, v := range listCategory {
-		matchTypeName = append(matchTypeName, v.MatchTypeName)
+		if v.MatchTypeName != "" {
+			matchTypeName = append(matchTypeName, v.MatchTypeName)
+		}
+
+		if v.SeriesName != "" {
+			seriesName = append(seriesName, v.SeriesName)
+		}
 	}
 
 	var condition string
 	//var pars []interface{}
-	condition = " AND field_name  IN  ('" + strings.Join(matchTypeName, "','") + "')"
+	if len(seriesName) == 0 {
+		condition = " AND field_name  IN  ('" + strings.Join(matchTypeName, "','") + "')"
+	} else {
+		condition = " AND  ( field_name  IN  ('" + strings.Join(matchTypeName, "','") + "')   OR series_name IN  ('" + strings.Join(seriesName, "','") + "')   )"
+	}
 
 	list, total, err = models.GetReportAndproductIndustrylListimgZhouqi(condition, startSize, pageSize)
 	if err != nil {

models/article.go

@@ -45,6 +45,7 @@ type CygxArticle struct {
 	VideoPlaySeconds string `description:"音频播放时长"`
 	Stock            string `description:"个股标签"`
 	FieldName        string `description:"产业标签"`
+	SeriesName       string `description:"系列名称"`
 	Annotation       string `description:"核心观点"`
 	TypeName         string `description:"策略平台报告类型"`
 	ModifyTimeByCl   string `description:"策略平台报告更新时间"`

models/tactics.go

@@ -80,6 +80,7 @@ type Tactics2 struct {
 	ReportType      int       `description:"报告类型，1行业报告，2产业报告,0无"`
 	Stock           string    `description:"个股标签"`
 	FieldName       string    `description:"产业标签"`
+	SeriesName      string    `description:"系列名称"`
 	File            string    `description:"Pdf下载链接"`
 	TypeName        string    `description:"策略平台报告类型"`
 	UpdateDate      string    `description:"策略平台报告更新时间"`

models/zhouqi_article_map.go

@@ -8,6 +8,7 @@ type CygxZhouqiArticleMap struct {
 	CategoryId        int    `description:"产业Id"`
 	ParentId          int    `description:"父级ID"`
 	MatchTypeName     string `description:"行业名称"`
+	SeriesName        string `description:"系列名称"`
 	ArticleUpdateTime string `description:"对应文章的更新时间"`
 }
 
@@ -18,6 +19,7 @@ func GetCygxZhouqiArticleMapFirst() (items []*CygxZhouqiArticleMap, err error) {
 			category_id,
 			parent_id,
 			match_type_name,
+			series_name,
 			article_update_time 
 		FROM
 			cygx_zhouqi_article_map 
@@ -36,6 +38,7 @@ func GetCygxZhouqiArticleMapByParentId(parentId int) (items []*CygxZhouqiArticle
 	sql := `SELECT
 			category_id,
 			match_type_name,
+			series_name,
 			article_update_time 
 		FROM
 			cygx_zhouqi_article_map 

services/article.go

@@ -964,6 +964,7 @@ func HandleArticleListByApi(artcleId int) (err error) {
 			item.Stock = stock
 		}
 		item.FieldName = articleResult.Field.Name
+		item.SeriesName = articleResult.Series.Name
 		item.TypeName = articleResult.Type.Name
 		item.UpdateDate = articleResult.UpdateDate
 		item.CeLueFieldId = articleResult.Field.Id
@@ -1154,6 +1155,7 @@ func HandleArticleListByApi(artcleId int) (err error) {
 			updateParams["FileLink"] = v.File
 			updateParams["Stock"] = v.Stock
 			updateParams["FieldName"] = v.FieldName
+			updateParams["SeriesName"] = v.SeriesName
 			updateParams["Annotation"] = v.Annotation
 			updateParams["TypeName"] = v.TypeName
 			updateParams["ModifyTimeByCl"] = v.UpdateDate
@@ -1198,6 +1200,7 @@ func HandleArticleListByApi(artcleId int) (err error) {
 			item.MatchTypeName = matchTypeName
 			item.Stock = v.Stock
 			item.FieldName = v.FieldName
+			item.SeriesName = v.SeriesName
 			item.Annotation = v.Annotation
 			item.TypeName = v.TypeName
 			item.ModifyTimeByCl = v.UpdateDate