报告过滤，相关分类时间更新

controllers/report.go

@@ -83,23 +83,6 @@ func (this *ReportController) IndustryList() {
 		return
 	}
 
-	//list2, err := models.GetTacticsListAll2()
-	//
-	//for _, v := range list2 {
-	//	var titleNew string
-	//	//titleNew = v.Title
-	//	// 7资金流向 、11大类资产 、51每日复盘 、80医药周报
-	//	if v.CategoryId == 11 && v.UpdateFrequency == "weekly" {
-	//		titleNew = v.Title + utils.WeekByDate(v.PublishDate)
-	//		fmt.Println(v.PublishDate)
-	//		fmt.Println(titleNew)
-	//		fmt.Println("————————————————")
-	//	}
-	//}
-	//
-	//straa := utils.WeekByDate(utils.StrTimeToTime("2021-05-16 23:00:00"))
-	//fmt.Println(straa)
-
 	uid := user.UserId
 	var orderSrt string
 	ChartPermissionId, _ := this.GetInt("ChartPermissionId")
@@ -175,7 +158,6 @@ func (this *ReportController) IndustryList() {
 		if recordCount == 0 {
 			list[k].IsRed = true
 		}
-
 	}
 	resp := new(models.IndustrialManagementList)
 	resp.List = list

models/industrial_management.go

@@ -29,6 +29,7 @@ WHERE
 	AND man.industrial_management_id NOT IN ( SELECT industrial_management_id FROM cygx_industry_top WHERE user_id = ` + strconv.Itoa(uid) + ` ) 
 	AND re.report_type = 2 
 	AND art.is_report = 1
+	AND art.is_class = 1
 GROUP BY
 	man.industry_name 
 ORDER BY ` + orderSrt
@@ -52,6 +53,7 @@ WHERE
 	AND top.user_id = ` + strconv.Itoa(uid) + `
 	AND re.report_type = 2 
 	AND art.is_report = 1
+	AND art.is_class = 1
 GROUP BY
 	man.industry_name 
 ORDER BY

models/report_mapping.go

@@ -78,6 +78,7 @@ func GetTradeAll(uid, ChartPermissionId int) (items []*TradeReportMapping, err e
 	WHERE
 	re.chart_permission_id = ?
 	AND re.report_type = 1
+	AND art.is_class = 1
 	AND re.chart_permission_id != 21
 	ORDER BY art.publish_date DESC
 	LIMIT 0,1`

services/tactics.go

@@ -307,7 +307,6 @@ func SyncTacticsListAddreport() (err error) {
 	//	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()
@@ -344,11 +343,6 @@ func SyncTacticsListAddreport() (err error) {
 			} else {
 				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)
@@ -364,9 +358,7 @@ func SyncTacticsListAddreport() (err error) {
 		if err != nil && err.Error() != utils.ErrNoRow() {
 			fmt.Println("AddCygxArticle Err:", err.Error())
 			return err
-
 		}
-		fmt.Println(v.IsClass)
 		v.Body = strings.Replace(v.Body, "http://vmp.hzinsights.com", "https://vmp.hzinsights.com", -1)
 		expertNumStr, expertContentStr, interviewDateStr := BodyAnalysis(v.Body)
 		var titleNew string
@@ -382,18 +374,8 @@ func SyncTacticsListAddreport() (err error) {
 		if v.CategoryId == 80 {
 			titleNew = v.Title + utils.WeekByDate(v.PublishDate)
 		}
-		fmt.Println(titleNew)
 		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, _ := GetReportContentTextSub(v.Body)
 			updateParams := make(map[string]interface{})
 			//updateParams["Title"] = v.Title