Merge branch 'cygx_8.3' into debug

controllers/report.go

@@ -684,30 +684,48 @@ func (this *ReportController) List() {
 	br.Msg = "获取成功"
 	br.Data = resp
 	} else {
-		////获取该产业下所对应的行业图片
-		//detail, errCategory := models.GetdetailByCategoryIdOne(categoryId)
-		//if errCategory != nil {
-		//	br.Msg = "获取信息失败"
-		//	br.ErrMsg = "获取信息失败,Err:" + errCategory.Error() + "categoryID 不存在：" + strconv.Itoa(categoryId)
-		//	return
-		//}
-		////对应行业的图片
-		//detailChartPermissionUrl, err := models.GetConfigByCode("category_chart_permissionimg_url")
-		//if err != nil {
-		//	br.Msg = "获取数据失败"
-		//	br.ErrMsg = "行业配置信息失败，Err:" + err.Error()
-		//	return
-		//}
-		//chartPermissionUrlList := strings.Split(detailChartPermissionUrl.ConfigValue, "{|}")
-		//mapChartPermission := make(map[string]string)
-		//var permissionName string
-		//var imgUrlChartPermission string
-		//for _, v := range chartPermissionUrlList {
-		//	vslice := strings.Split(v, "_")
-		//	permissionName = vslice[0]
-		//	imgUrlChartPermission = vslice[len(vslice)-1]
-		//	mapChartPermission[permissionName] = imgUrlChartPermission
-		//}
+		//获取该产业下所对应的行业图片
+		//因为时间线不属于数据表里的二级分类，所以图片Id用产业id查到的list中的任意一个categoryId取到的图片替代
+		categoryList, err := models.IndustrialToArticleCategoryNew(industrialManagementId)
+		if err != nil {
+			br.Msg = "获取信息失败"
+			br.ErrMsg = "获取品种信息失败,Err:" + err.Error()
+			return
+		}
+		var timeLineCategoryId int
+		if len(categoryList) > 0{
+			timeLineCategoryId = categoryList[0].CategoryId
+		}
+
+		var detail *models.ReportMapping
+		var errCategory error
+
+		if timeLineCategoryId >0 {
+			detail, errCategory = models.GetdetailByCategoryIdOne(timeLineCategoryId)
+			if errCategory != nil {
+				br.Msg = "获取信息失败"
+				br.ErrMsg = "获取信息失败,Err:" + errCategory.Error() + "categoryID 不存在：" + strconv.Itoa(categoryId)
+				return
+			}
+		}
+
+		//对应行业的图片
+		detailChartPermissionUrl, err := models.GetConfigByCode("category_chart_permissionimg_url")
+		if err != nil {
+			br.Msg = "获取数据失败"
+			br.ErrMsg = "行业配置信息失败，Err:" + err.Error()
+			return
+		}
+		chartPermissionUrlList := strings.Split(detailChartPermissionUrl.ConfigValue, "{|}")
+		mapChartPermission := make(map[string]string)
+		var permissionName string
+		var imgUrlChartPermission string
+		for _, v := range chartPermissionUrlList {
+			vslice := strings.Split(v, "_")
+			permissionName = vslice[0]
+			imgUrlChartPermission = vslice[len(vslice)-1]
+			mapChartPermission[permissionName] = imgUrlChartPermission
+		}
 
 		total, err := models.GetTimeLineReportIndustrialCount(industrialManagementId)
 		if err != nil {
@@ -722,31 +740,31 @@ func (this *ReportController) List() {
 			br.ErrMsg = "获取帖子数据失败，Err:" + err.Error()
 			return
 		}
-		////对应分类的所图片
-		//detailCategoryUrl, err := models.GetConfigByCode("category_map_img_url")
-		//if err != nil {
-		//	br.Msg = "获取数据失败"
-		//	br.ErrMsg = "行业配置信息失败，Err:" + err.Error()
-		//	return
-		//}
-		//categoryUrlList := strings.Split(detailCategoryUrl.ConfigValue, "{|}")
-		//mapCategoryUrl := make(map[string]string)
-		//var categoryIdStr string
-		//var imgUrlChart string
-		//for _, v := range categoryUrlList {
-		//	vslice := strings.Split(v, "_")
-		//	categoryIdStr = vslice[0]
-		//	imgUrlChart = vslice[len(vslice)-1]
-		//	mapCategoryUrl[categoryIdStr] = imgUrlChart
-		//}
+		//对应分类的所图片
+		detailCategoryUrl, err := models.GetConfigByCode("category_map_img_url")
+		if err != nil {
+			br.Msg = "获取数据失败"
+			br.ErrMsg = "行业配置信息失败，Err:" + err.Error()
+			return
+		}
+		categoryUrlList := strings.Split(detailCategoryUrl.ConfigValue, "{|}")
+		mapCategoryUrl := make(map[string]string)
+		var categoryIdStr string
+		var imgUrlChart string
+		for _, v := range categoryUrlList {
+			vslice := strings.Split(v, "_")
+			categoryIdStr = vslice[0]
+			imgUrlChart = vslice[len(vslice)-1]
+			mapCategoryUrl[categoryIdStr] = imgUrlChart
+		}
 
-		//lenList := len(list)
-		//for i := 0; i < lenList; i++ {
-		//	item := list[i]
-		//	list[i].Content, _ = services.GetReportContentTextSub(item.Content)
-		//	//list[i].Abstract = html.UnescapeString(item.Abstract)
-		//	list[i].Abstract, _ = services.GetReportContentTextSub(item.Abstract)
-		//}
+		lenList := len(list)
+		for i := 0; i < lenList; i++ {
+			item := list[i]
+			list[i].Content, _ = services.GetReportContentTextSub(item.Content)
+			//list[i].Abstract = html.UnescapeString(item.Abstract)
+			//list[i].Abstract, _ = services.GetReportContentTextSub(item.Abstract)
+		}
 
 		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)) {
@@ -755,18 +773,20 @@ func (this *ReportController) List() {
 			if v.VideoUrl != "" {
 				list[k].IsHaveVideo = true
 			}
-			//list[k].ImgUrlPc = mapCategoryUrl[v.CategoryId]
-			//
-			//if mapCategoryUrl[v.CategoryId] == "" {
-			//	if detail.ChartPermissionId == utils.YI_YAO_ID {
-			//		list[k].ImgUrlPc = utils.YI_YAO_QI_TA
-			//	}
-			//}
+			id := strconv.Itoa(timeLineCategoryId)
+			list[k].ImgUrlPc = mapCategoryUrl[id]
+
+			if mapCategoryUrl[id] == "" {
+				if detail.ChartPermissionId == utils.YI_YAO_ID {
+					list[k].ImgUrlPc = utils.YI_YAO_QI_TA
+				}
+			}
 		}
 
-		//resp.CategoryImgUrlPc = mapChartPermission[detail.ChartPermissionName]
 
 		resp := new(models.TimeLineReportListResp)
+		resp.CategoryImgUrlPc = mapChartPermission[detail.ChartPermissionName]
+
 		resp.List = list
 		resp.Paging = page
 		br.Ret = 200

models/report.go

@@ -850,12 +850,14 @@ WHERE
 }
 
 type TimeLineReportItem struct {
-	Id          int    `description:"文章或晨报点评id"`
-	Title       string `description:"标题"`
-	PublishTime string `description:"发布时间"`
-	Content     string `description:"内容"`
-	VideoUrl    string `description:"视频链接"`
-	IsHaveVideo bool   `description:"是否包含视频"`
+	Id              int    `description:"文章或晨报点评id"`
+	Title           string `description:"标题"`
+	PublishTime     string `description:"发布时间"`
+	Content         string `description:"内容"`
+	VideoUrl        string `description:"视频链接"`
+	IsHaveVideo     bool   `description:"是否包含视频"`
+	ImgUrlPc        string `description:"pc图片"`
+	SubCategoryName string `description:"二级分类"`
 }
 
 //获取产业报告+晨会点评列表
@@ -870,6 +872,7 @@ FROM
 		a.title,
 		a.publish_date AS publish_time,
 		a.video_url,
+		a.sub_category_name,
 		'' AS content 
 	FROM
 		cygx_article AS a
@@ -883,6 +886,7 @@ FROM
 		'' AS title,
 		mm.publish_time AS publish_time,
 		'' AS video_url,
+		'时间线' AS sub_category_name,
 		mmc.content 
 	FROM
 		cygx_morning_meeting_review_chapter AS mmc