报告归类修改

controllers/article.go

@@ -417,187 +417,214 @@ func (this *ArticleCommonController) Detail() {
 //
 //	fmt.Println("同步数据")
 //	indexName := utils.IndexName
-//	//endDate := time.Now().AddDate(0, 0, -7).Format(utils.FormatDate)
-//	//list, err := models.GetTacticsList(endDate)
-//	list, err := models.GetTacticsListAll2()
+//	fmt.Println(indexName)
+//	endDate := time.Now().AddDate(0, 0, -7).Format(utils.FormatDate)
+//	list, err := models.GetTacticsList(endDate)
+//	//list, err := models.GetTacticsListAll2()
 //	if err != nil {
 //		fmt.Println("GetTacticsList Err:", err.Error())
 //		return
 //	}
 //	fmt.Println("list len:", len(list))
 //
-//	listSummary, errsu := models.GetReportMappingCategoryID()
-//	if errsu != nil {
-//		fmt.Println("GetTacticsList Err:", errsu.Error())
-//		return
+//	summaryCategoryIds := "28,32,45,50,57,62,72,74,79,84,86,88,90,95,96" //纪要库的文章类型ID
+//	listSummarys := strings.Split(summaryCategoryIds, ",")
+//	fmt.Println(listSummarys)
+//	for _, v := range listSummarys {
+//		vs, _ := strconv.Atoi(v)
+//		fmt.Printf("n 的类型 %T", vs)
 //	}
 //
-//	listPermission, errper := models.GetPermissionMappingCategoryID()
-//	if errper != nil {
-//		fmt.Println("GetTacticsList Err:", errper.Error())
-//		return
-//	}
-//	for k, v := range list {
+//	for _, v := range list {
+//		for _, vs := range listSummarys {
+//			vint, _ := strconv.Atoi(vs)
+//			//fmt.Printf("vint 的类型 %T", vint)
+//			//fmt.Println("————————————")
+//			//fmt.Printf("vCategoryId 的类型 %T", v.CategoryId)
+//			//fmt.Println("————————————")
+//
+//			if v.CategoryId == vint {
 //
-//		//是否属于纪要库
-//		//countSummary, err := models.GetPermissionMappingById(v.CategoryId)
-//		//if err != nil && err.Error() != utils.ErrNoRow() {
-//		//	br.Msg = "参数解析异常！"
-//		//	br.ErrMsg = "参数解析失败，Err:" + err.Error()
-//		//	return
-//		//}
-//		//if countSummary > 0 {
-//		//	v.IsSummary = 1
-//		//}
-//		for _, vSum := range listSummary {
-//			if v.CategoryId == vSum.CategoryId {
-//				v.IsSummary = 1
 //			}
 //		}
-//		//是否属于报告
-//		//countReport, err := models.GetReportMappingById(v.CategoryId)
-//		//if err != nil && err.Error() != utils.ErrNoRow() {
-//		//	br.Msg = "参数解析异常！"
-//		//	br.ErrMsg = "参数解析失败，Err:" + err.Error()
-//		//	return
-//		//}
-//		for _, vPer := range listPermission {
-//			if v.CategoryId == vPer.CategoryId {
-//				v.IsReport = 1
-//			}
+//	}
+//
+//	br.Msg = "测试！"
+//	br.ErrMsg = "参数解析失败，Err:"
+//	return
+
+//listSummary, errsu := models.GetReportMappingCategoryID()
+//if errsu != nil {
+//	fmt.Println("GetTacticsList Err:", errsu.Error())
+//	return
+//}
+//
+//listPermission, errper := models.GetPermissionMappingCategoryID()
+//if errper != nil {
+//	fmt.Println("GetTacticsList Err:", errper.Error())
+//	return
+//}
+//for k, v := range list {
+//
+//	//是否属于纪要库
+//	//countSummary, err := models.GetPermissionMappingById(v.CategoryId)
+//	//if err != nil && err.Error() != utils.ErrNoRow() {
+//	//	br.Msg = "参数解析异常！"
+//	//	br.ErrMsg = "参数解析失败，Err:" + err.Error()
+//	//	return
+//	//}
+//	//if countSummary > 0 {
+//	//	v.IsSummary = 1
+//	//}
+//	for _, vSum := range listSummary {
+//		if v.CategoryId == vSum.CategoryId {
+//			v.IsSummary = 1
 //		}
-//		if v.IsReport > 0 {
-//			//是否属于策略 策略自动归类
-//			//是否属于行业报告 行业报告自动归类
-//			if v.CategoryId == 7 || v.CategoryId == 11 || v.CategoryId == 51 || v.CategoryId == 52 || v.CategoryId == 64 || v.CategoryId == 80 || v.CategoryId == 87 {
-//				v.IsClass = 1
-//			}
-//			if v.CategoryId == 64 || v.CategoryId == 87 || v.CategoryId == 80 {
-//				v.ReportType = 2 //是否属于行业报告
-//			} else {
-//				v.ReportType = 1 //是否属于产业报告
-//			}
+//	}
+//	//是否属于报告
+//	//countReport, err := models.GetReportMappingById(v.CategoryId)
+//	//if err != nil && err.Error() != utils.ErrNoRow() {
+//	//	br.Msg = "参数解析异常！"
+//	//	br.ErrMsg = "参数解析失败，Err:" + err.Error()
+//	//	return
+//	//}
+//	for _, vPer := range listPermission {
+//		if v.CategoryId == vPer.CategoryId {
+//			v.IsReport = 1
 //		}
-//		v.Department = "弘则权益研究"
-//		fmt.Println(k, v.ArticleId)
-//		hh, _ := time.ParseDuration("8h")
-//		//pDate := publishDate.Add(hh)
-//		v.PublishDate = v.PublishDate.Add(hh)
-//		//判断是否已经存在
-//		if v.ArticleId < 0 {
-//			if err != nil {
-//				br.Msg = "参数解析异常！"
-//				br.ErrMsg = "参数解析失败，Err:" + err.Error()
-//				return
-//			}
+//	}
+//	if v.IsReport > 0 {
+//		//是否属于策略 策略自动归类
+//		//是否属于行业报告 行业报告自动归类
+//		if v.CategoryId == 7 || v.CategoryId == 11 || v.CategoryId == 51 || v.CategoryId == 52 || v.CategoryId == 64 || v.CategoryId == 80 || v.CategoryId == 87 {
+//			v.IsClass = 1
+//		}
+//		if v.CategoryId == 64 || v.CategoryId == 87 || v.CategoryId == 80 {
+//			v.ReportType = 2 //是否属于行业报告
+//		} else {
+//			v.ReportType = 1 //是否属于产业报告
 //		}
-//		count, err := models.GetArticleCountById(v.ArticleId)
-//		if err != nil && err.Error() != utils.ErrNoRow() {
+//	}
+//	v.Department = "弘则权益研究"
+//	fmt.Println(k, v.ArticleId)
+//	hh, _ := time.ParseDuration("8h")
+//	//pDate := publishDate.Add(hh)
+//	v.PublishDate = v.PublishDate.Add(hh)
+//	//判断是否已经存在
+//	if v.ArticleId < 0 {
+//		if err != nil {
 //			br.Msg = "参数解析异常！"
 //			br.ErrMsg = "参数解析失败，Err:" + err.Error()
 //			return
 //		}
-//		fmt.Println(v.IsClass)
-//		v.Body = strings.Replace(v.Body, "http://vmp.hzinsights.com", "https://vmp.hzinsights.com", -1)
-//		expertNumStr, expertContentStr, interviewDateStr := services.BodyAnalysis(v.Body)
-//		if count > 0 {
-//			fmt.Println(k, v.ArticleId, "edit")
-//			//articleInfo, err := models.GetArticleDetailById(v.ArticleId)
-//			//if err != nil {
-//			//	br.Msg = "同步失败！文章ID：" + strconv.Itoa(v.ArticleId)
-//			//	br.ErrMsg = "同步失败，Err:" + err.Error()
-//			//	return
-//			//}
-//			//if articleInfo.IsClass == 1 {
-//			//	v.IsClass = 1
-//			//}
-//			bodyText, _ := services.GetReportContentTextSub(v.Body)
-//			updateParams := make(map[string]interface{})
-//			updateParams["Title"] = v.Title
-//			updateParams["TitleEn"] = v.TitleEn
-//			updateParams["UpdateFrequency"] = v.UpdateFrequency
-//			updateParams["CreateDate"] = v.CreateDate
-//			updateParams["PublishDate"] = v.PublishDate
-//			updateParams["Body"] = html.EscapeString(v.Body)
-//			updateParams["BodyText"] = bodyText
-//			updateParams["Abstract"] = html.EscapeString(v.Abstract)
-//			updateParams["CategoryName"] = v.CategoryName
-//			updateParams["SubCategoryName"] = v.SubCategoryName
-//			updateParams["CategoryId"] = v.CategoryId
-//			updateParams["PublishStatus"] = v.PublishStatus
-//			updateParams["ExpertBackground"] = expertContentStr
-//			updateParams["ExpertNumber"] = expertNumStr
-//			updateParams["InterviewDate"] = interviewDateStr
-//			updateParams["IsClass"] = v.IsClass
-//			updateParams["IsSummary"] = v.IsSummary
-//			updateParams["IsReport"] = v.IsReport
-//			updateParams["ReportType"] = v.ReportType
-//			if v.Department != "弘则权益研究" {
-//				v.Department = "弘则权益研究"
-//			}
-//			updateParams["Department"] = v.Department
-//			whereParam := map[string]interface{}{"article_id": v.ArticleId}
-//			err = models.UpdateByExpr(models.CygxArticle{}, whereParam, updateParams)
-//			if err != nil {
-//				fmt.Println("UpdateByExpr Err:" + err.Error())
-//			}
-//		} else {
-//			fmt.Println(k, v.ArticleId, "add")
-//			item := new(models.CygxArticle)
-//			articleIdInt := v.ArticleId
-//			item.ArticleId = articleIdInt
-//			item.Title = v.Title
-//			item.TitleEn = v.TitleEn
-//			item.UpdateFrequency = v.UpdateFrequency
-//			item.CreateDate = v.CreateDate
-//			item.PublishDate = v.PublishDate.Format(utils.FormatDateTime)
-//			item.Body = html.EscapeString(v.Body)
-//			item.Abstract = html.EscapeString(v.Abstract)
-//			item.CategoryName = v.CategoryName
-//			item.SubCategoryName = v.SubCategoryName
-//			item.CategoryId = v.CategoryId
-//			item.PublishStatus = v.PublishStatus
-//			item.ExpertBackground = expertContentStr
-//			item.ExpertNumber = expertNumStr
-//			item.InterviewDate = interviewDateStr
-//			item.Department = v.Department
-//			item.ArticleIdMd5 = utils.MD5(strconv.Itoa(articleIdInt))
-//			item.IsClass = v.IsClass
-//			item.IsSummary = v.IsSummary
-//			item.IsReport = v.IsReport
-//			item.ReportType = v.ReportType
-//			_, err = models.AddCygxArticles(item)
-//			if err != nil {
-//				fmt.Println("AddCygxArticle Err:", err.Error())
-//				br.Msg = "参数解析异常！"
-//				br.ErrMsg = "参数解析失败，Err:" + err.Error()
-//				return
-//			}
+//	}
+//	count, err := models.GetArticleCountById(v.ArticleId)
+//	if err != nil && err.Error() != utils.ErrNoRow() {
+//		br.Msg = "参数解析异常！"
+//		br.ErrMsg = "参数解析失败，Err:" + err.Error()
+//		return
+//	}
+//	fmt.Println(v.IsClass)
+//	v.Body = strings.Replace(v.Body, "http://vmp.hzinsights.com", "https://vmp.hzinsights.com", -1)
+//	expertNumStr, expertContentStr, interviewDateStr := services.BodyAnalysis(v.Body)
+//	if count > 0 {
+//		fmt.Println(k, v.ArticleId, "edit")
+//		//articleInfo, err := models.GetArticleDetailById(v.ArticleId)
+//		//if err != nil {
+//		//	br.Msg = "同步失败！文章ID：" + strconv.Itoa(v.ArticleId)
+//		//	br.ErrMsg = "同步失败，Err:" + err.Error()
+//		//	return
+//		//}
+//		//if articleInfo.IsClass == 1 {
+//		//	v.IsClass = 1
+//		//}
+//		bodyText, _ := services.GetReportContentTextSub(v.Body)
+//		updateParams := make(map[string]interface{})
+//		updateParams["Title"] = v.Title
+//		updateParams["TitleEn"] = v.TitleEn
+//		updateParams["UpdateFrequency"] = v.UpdateFrequency
+//		updateParams["CreateDate"] = v.CreateDate
+//		updateParams["PublishDate"] = v.PublishDate
+//		updateParams["Body"] = html.EscapeString(v.Body)
+//		updateParams["BodyText"] = bodyText
+//		updateParams["Abstract"] = html.EscapeString(v.Abstract)
+//		updateParams["CategoryName"] = v.CategoryName
+//		updateParams["SubCategoryName"] = v.SubCategoryName
+//		updateParams["CategoryId"] = v.CategoryId
+//		updateParams["PublishStatus"] = v.PublishStatus
+//		updateParams["ExpertBackground"] = expertContentStr
+//		updateParams["ExpertNumber"] = expertNumStr
+//		updateParams["InterviewDate"] = interviewDateStr
+//		updateParams["IsClass"] = v.IsClass
+//		updateParams["IsSummary"] = v.IsSummary
+//		updateParams["IsReport"] = v.IsReport
+//		updateParams["ReportType"] = v.ReportType
+//		if v.Department != "弘则权益研究" {
+//			v.Department = "弘则权益研究"
 //		}
-//		//纪要库的数据同步到Es
-//		if v.IsSummary == 1 {
-//			content := html.UnescapeString(v.Body)
-//			doc, err := goquery.NewDocumentFromReader(strings.NewReader(content))
-//			if err != nil {
-//				fmt.Println("create doc err:", err.Error())
-//				br.Msg = "参数解析异常！"
-//				br.ErrMsg = "参数解析失败，Err:" + err.Error()
-//				return
-//			}
-//			doc.Find("a").Each(func(i int, a *goquery.Selection) {
-//				a.Remove()
-//			})
-//			bodyText := doc.Text()
-//			item := new(services.ElasticTestArticleDetail)
-//			item.ArticleId = v.ArticleId
-//			item.Title = v.Title
-//			item.BodyText = bodyText
-//			item.PublishDate = v.PublishDate.Format(utils.FormatDateTime)
-//			services.EsAddOrEditData(indexName, strconv.Itoa(v.ArticleId), item)
+//		updateParams["Department"] = v.Department
+//		whereParam := map[string]interface{}{"article_id": v.ArticleId}
+//		err = models.UpdateByExpr(models.CygxArticle{}, whereParam, updateParams)
+//		if err != nil {
+//			fmt.Println("UpdateByExpr Err:" + err.Error())
+//		}
+//	} else {
+//		fmt.Println(k, v.ArticleId, "add")
+//		item := new(models.CygxArticle)
+//		articleIdInt := v.ArticleId
+//		item.ArticleId = articleIdInt
+//		item.Title = v.Title
+//		item.TitleEn = v.TitleEn
+//		item.UpdateFrequency = v.UpdateFrequency
+//		item.CreateDate = v.CreateDate
+//		item.PublishDate = v.PublishDate.Format(utils.FormatDateTime)
+//		item.Body = html.EscapeString(v.Body)
+//		item.Abstract = html.EscapeString(v.Abstract)
+//		item.CategoryName = v.CategoryName
+//		item.SubCategoryName = v.SubCategoryName
+//		item.CategoryId = v.CategoryId
+//		item.PublishStatus = v.PublishStatus
+//		item.ExpertBackground = expertContentStr
+//		item.ExpertNumber = expertNumStr
+//		item.InterviewDate = interviewDateStr
+//		item.Department = v.Department
+//		item.ArticleIdMd5 = utils.MD5(strconv.Itoa(articleIdInt))
+//		item.IsClass = v.IsClass
+//		item.IsSummary = v.IsSummary
+//		item.IsReport = v.IsReport
+//		item.ReportType = v.ReportType
+//		_, err = models.AddCygxArticles(item)
+//		if err != nil {
+//			fmt.Println("AddCygxArticle Err:", err.Error())
+//			br.Msg = "参数解析异常！"
+//			br.ErrMsg = "参数解析失败，Err:" + err.Error()
+//			return
 //		}
 //	}
-//	br.Ret = 200
-//	br.Success = true
-//	br.Msg = "同步成功"
-//
+//	//纪要库的数据同步到Es
+//	if v.IsSummary == 1 {
+//		content := html.UnescapeString(v.Body)
+//		doc, err := goquery.NewDocumentFromReader(strings.NewReader(content))
+//		if err != nil {
+//			fmt.Println("create doc err:", err.Error())
+//			br.Msg = "参数解析异常！"
+//			br.ErrMsg = "参数解析失败，Err:" + err.Error()
+//			return
+//		}
+//		doc.Find("a").Each(func(i int, a *goquery.Selection) {
+//			a.Remove()
+//		})
+//		bodyText := doc.Text()
+//		item := new(services.ElasticTestArticleDetail)
+//		item.ArticleId = v.ArticleId
+//		item.Title = v.Title
+//		item.BodyText = bodyText
+//		item.PublishDate = v.PublishDate.Format(utils.FormatDateTime)
+//		services.EsAddOrEditData(indexName, strconv.Itoa(v.ArticleId), item)
+//	}
+//}
+//br.Ret = 200
+//br.Success = true
+//br.Msg = "同步成功"
+
 //}

models/article.go

@@ -275,7 +275,7 @@ type ReportMappingCategoryRep struct {
 
 func GetReportMappingCategoryID() (item []*ReportMappingCategoryRep, err error) {
 	o := orm.NewOrm()
-	sql := ` SELECT category_id FROM cygx_permission_mapping  GROUP BY category_id `
+	sql := ` SELECT category_id FROM cygx_permission_mapping  GROUP BY category_id  `
 	_, err = o.Raw(sql).QueryRows(&item)
 	return
 }

models/home.go

@@ -1,6 +1,7 @@
 package models
 
 import (
+	"fmt"
 	"rdluck_tools/orm"
 	"rdluck_tools/paging"
 )
@@ -26,6 +27,7 @@ func GetHomeList(condition string, pars []interface{}, startSize, pageSize int)
 		sql += condition
 	}
 	sql += ` ORDER BY publish_date DESC LIMIT ?,? `
+	fmt.Println(sql)
 	_, err = o.Raw(sql, pars, startSize, pageSize).QueryRows(&items)
 	return
 }

models/tactics.go

@@ -90,8 +90,8 @@ func GetTacticsList2(endDate string) (list []*Tactics2, err error) {
 			INNER JOIN article_content AS b ON a.id=b.article_id
 			INNER JOIN article_category AS c ON a.id=c.article_id
 			INNER JOIN article_categoryinfo AS d ON c.category_id=d.id
-			WHERE a.publish_status=1  AND a.publish_date>=? AND d.id IN (7,11,28,32,45,50,51,52,57,62,64,65,66,67,69,71,74,79,80,84,85,86,87,88,89,90,95,96) 
-            AND a.id NOT IN (3454,3456,3457,3459,2449,2450,2453,2454,2459,2530,2583,2663,2670,2699,2715,2732,2748,2759,2399,2356,2870,3173,2978,2826,3470) `
+			WHERE a.publish_status=1  AND a.publish_date>=? AND d.id IN (7,11,28,32,45,50,51,52,57,62,64,65,66,67,69,71,74,79,80,84,85,86,87,88,89,90,95,96) `
+	//AND a.id NOT IN (3454,3456,3457,3459,2449,2450,2453,2454,2459,2530,2583,2663,2670,2699,2715,2732,2748,2759,2399,2356,2870,3173,2978,2826,3470) `
 	//IN(85,71)
 	_, err = o.Raw(sql, endDate).QueryRows(&list)
 	return
@@ -105,8 +105,8 @@ func GetTacticsListAll2() (list []*Tactics2, err error) {
 			INNER JOIN article_content AS b ON a.id=b.article_id
 			INNER JOIN article_category AS c ON a.id=c.article_id
 			INNER JOIN article_categoryinfo AS d ON c.category_id=d.id
-			WHERE a.publish_status=1  AND d.id IN (7,11,28,32,45,50,51,52,57,62,64,65,66,67,69,71,74,79,80,84,85,86,87,88,89,90,95,96) 
-            AND a.id NOT IN (3454,3456,3457,3459,2449,2450,2453,2454,2459,2530,2583,2663,2670,2699,2715,2732,2748,2759,2399,2356,2870,3173,2978,2826,3470) `
+			WHERE a.publish_status=1  AND d.id IN (7,11,28,32,45,50,51,52,57,62,64,65,66,67,69,71,74,79,80,84,85,86,87,88,89,90,95,96) `
+	//AND a.id NOT IN (3454,3456,3457,3459,2449,2450,2453,2454,2459,2530,2583,2663,2670,2699,2715,2732,2748,2759,2399,2356,2870,3173,2978,2826,3470) `
 	//IN(85,71)
 	_, err = o.Raw(sql).QueryRows(&list)
 	return

services/tactics.go

@@ -291,49 +291,45 @@ func SyncTacticsListAddreport() (err error) {
 	}()
 	fmt.Println("同步数据")
 	indexName := utils.IndexName
-	endDate := time.Now().AddDate(0, 0, -30).Format(utils.FormatDate)
-	list, err := models.GetTacticsList2(endDate)
-	//list, err := models.GetTacticsListAll2()
+	//endDate := time.Now().AddDate(0, 0, -30).Format(utils.FormatDate)
+	//list, err := models.GetTacticsList2(endDate)
+	list, err := models.GetTacticsListAll2()
 	if err != nil {
 		fmt.Println("GetTacticsList Err:", err.Error())
 		return
 	}
 	fmt.Println("list len:", len(list))
 
-	listSummary, errsu := models.GetReportMappingCategoryID()
-	if errsu != nil {
-		fmt.Println("GetTacticsList Err:", errsu.Error())
-		return
-	}
+	summaryCategoryIds := "28,32,45,50,57,62,72,74,79,84,86,88,90,95,96" //纪要库的文章类型categoty_id
+	listSummary := strings.Split(summaryCategoryIds, ",")
+	//listSummary, errsu := models.GetReportMappingCategoryID()
+	//if errsu != nil {
+	//	fmt.Println("GetTacticsList Err:", errsu.Error())
+	//	return
+	//}
 
+	noSummaryArticleIds := "3454,3456,3457,3459,2449,2450,2453,2454,2459,2530,2583,2663,2670,2699,2715,2732,2748,2759,2399,2356,2870,3173,2978,2826,3470" //非纪要库类型的文章ID
+	listNoSummaryArticleIds := strings.Split(noSummaryArticleIds, ",")
 	listPermission, errper := models.GetPermissionMappingCategoryID()
 	if errper != nil {
 		fmt.Println("GetTacticsList Err:", errper.Error())
 		return
 	}
 	for k, v := range list {
-		//是否属于纪要库
-		//countSummary, err := models.GetPermissionMappingById(v.CategoryId)
-		//if err != nil && err.Error() != utils.ErrNoRow() {
-		//	br.Msg = "参数解析异常！"
-		//	br.ErrMsg = "参数解析失败，Err:" + err.Error()
-		//	return
-		//}
-		//if countSummary > 0 {
-		//	v.IsSummary = 1
-		//}
+		//是否属于纪要库的数据
 		for _, vSum := range listSummary {
-			if v.CategoryId == vSum.CategoryId {
+			vSumInt, _ := strconv.Atoi(vSum)
+			if v.CategoryId == vSumInt {
 				v.IsSummary = 1
 			}
 		}
-		//是否属于报告
-		//countReport, err := models.GetReportMappingById(v.CategoryId)
-		//if err != nil && err.Error() != utils.ErrNoRow() {
-		//	br.Msg = "参数解析异常！"
-		//	br.ErrMsg = "参数解析失败，Err:" + err.Error()
-		//	return
-		//}
+		//排除不属于纪要库类型的文章
+		for _, vArt := range listNoSummaryArticleIds {
+			vArtInt, _ := strconv.Atoi(vArt)
+			if v.ArticleId == vArtInt {
+				v.IsSummary = 0
+			}
+		}
 		for _, vPer := range listPermission {
 			if v.CategoryId == vPer.CategoryId {
 				v.IsReport = 1
@@ -344,12 +340,15 @@ func SyncTacticsListAddreport() (err error) {
 			//是否属于行业报告 行业报告自动归类
 			if v.CategoryId == 7 || v.CategoryId == 11 || v.CategoryId == 51 || v.CategoryId == 52 || v.CategoryId == 64 || v.CategoryId == 80 || v.CategoryId == 87 {
 				v.IsClass = 1
-			}
-			if v.CategoryId == 64 || v.CategoryId == 87 || v.CategoryId == 80 {
-				v.ReportType = 2 //是否属于行业报告
+				v.ReportType = 1 //是否属于行业报告
 			} else {
-				v.ReportType = 1 //是否属于产业报告
+				v.ReportType = 2 //是否属于产业报告
 			}
+			//if v.CategoryId == 64 || v.CategoryId == 87 || v.CategoryId == 80 {
+			//	v.ReportType = 2 //是否属于行业报告
+			//} else {
+			//	v.ReportType = 1 //是否属于产业报告
+			//}
 		}
 		v.Department = "弘则权益研究"
 		fmt.Println(k, v.ArticleId)