。。

controller/pc/pc.go

@@ -162,6 +162,12 @@ func ClassifyDetailBanner(c *gin.Context) {
 		return
 	}
 
+	//查询分类类别，根据分类配置显示专栏还是报告合集
+	parentClassify, err := classify.GetByClassifyNameFirst(classifyName)
+	if err != nil {
+		response.Fail("获取分类信息失败"+err.Error(), c)
+		return
+	}
 	var bannerResp *pcModels.DetailBannerResp
 	if classifyName == "周报" || classifyName == "晨报" {
 		chapterItem, err := report_chapter.GetLatestChapterByClassifyName(classifyName)
@@ -211,7 +217,8 @@ func ClassifyDetailBanner(c *gin.Context) {
 			ClassifyNameSecond: reportItem.ClassifyNameSecond,
 			ClassifyIdSecond:   reportItem.ClassifyIdSecond,
 		}
-		if classifyName == "月报" || classifyName == "双周报" || classifyName == "会议纪要" || classifyName == "大事点评" || classifyName == "年报合集" {
+
+		if parentClassify.ShowType == 1 || parentClassify.ShowType == 3 {
 			resp.Type = "报告合集"
 		} else {
 			resp.Type = "专栏详情"
@@ -219,7 +226,7 @@ func ClassifyDetailBanner(c *gin.Context) {
 		bannerResp = resp
 	}
 	//有人的用人的底图，和上新公告图片不完全一样
-	firstNameMap := map[string]string{
+	/*firstNameMap := map[string]string{
 		"晨报":  utils.ALIYUN_YBIMG_HOST + "day.png",
 		"周报":  utils.ALIYUN_YBIMG_HOST + "week.png",
 		"双周报": utils.ALIYUN_YBIMG_HOST + "two_week.png",
@@ -233,7 +240,7 @@ func ClassifyDetailBanner(c *gin.Context) {
 		//"需求报告":    utils.ALIYUN_YBIMG_HOST + "lxt.png",
 		//"碳市场价格周报": utils.ALIYUN_YBIMG_HOST + "sjx.png",
 		//"行业调研":    utils.ALIYUN_YBIMG_HOST + "qp.png",
-	}
+	}*/
 	//secondNameMap := map[string]string{
 	//	//宏观报告
 	//	"宏观周期观察":     utils.ALIYUN_YBIMG_HOST + "gx.png",
@@ -329,9 +336,9 @@ func ClassifyDetailBanner(c *gin.Context) {
 		"酒子怡": utils.ALIYUN_YBIMG_HOST + "jzy.png",
 	}
 
-	if url, ok := firstNameMap[bannerResp.ClassifyNameFirst]; ok {
-		bannerResp.ImgUrl = url
-	} else if url, ok = authorMap[bannerResp.ReportAuthor]; ok {
+	if parentClassify.ShowType == 1 || parentClassify.ShowType == 3{
+		bannerResp.ImgUrl = parentClassify.YbRightBanner
+	} else if url, ok := authorMap[bannerResp.ReportAuthor]; ok {
 		bannerResp.ImgUrl = url
 	}
 	response.OkData("查询成功", bannerResp, c)

models/tables/rddp/classify/classify.go

@@ -30,7 +30,8 @@ type Classify struct {
 	YbFiccPcIcon      string    `gorm:"column:yb_ficc_pc_icon" db:"yb_ficc_pc_icon" json:"yb_ficc_pc_icon" form:"yb_ficc_pc_icon"`             //研报 pc端ficc页码图标
 	YbFiccSort        int       `gorm:"column:yb_ficc_sort" db:"yb_ficc_sort" json:"yb_ficc_sort" form:"yb_ficc_sort"`                         //研报小程序端ficc页面排序
 	YbListImg         string    `gorm:"column:yb_list_img" db:"yb_list_img" json:"yb_list_img" form:"yb_list_img"`                             //研报小程序端报告列表封面图
-	YbShareBgImg      string    `gorm:"column:yb_share_bg_img;" db:"yb_share_bg_img" json:"yb_share_bg_img" form:"yb_share_bg_img"`            // 研报小程序-报告分享背景图
+	YbShareBgImg      string    `gorm:"column:yb_share_bg_img;" db:"yb_share_bg_img" json:"yb_share_bg_img" form:"yb_share_bg_img"`
+	YbRightBanner     string    `gorm:"column:yb_right_banner;" db:"yb_right_banner" json:"yb_right_banner" form:"yb_right_banner"` // 研报小程序-报告分享背景图
 }
 
 func (c *Classify) TableName() string {

models/tables/rddp/classify/query.go

@@ -18,6 +18,15 @@ func GetByClassifyName(classifyName string) (item *Classify, err error) {
 	return
 }
 
+// GetByClassifyNameFirst 根据一级分类名称查找一级分类
+func GetByClassifyNameFirst(classifyName string) (item *Classify, err error) {
+	err = global.MYSQL["rddp"].Model(Classify{}).Where("classify_name = ? and parent_id = 0", classifyName).First(&item).Error
+	if err == utils.ErrNoRow {
+		err = nil
+	}
+	return
+}
+
 // GetSecondIdsByClassifyNames 根据权限相关的二级分类名称获取名称ID
 func GetSecondIdsByClassifyNames(names []string) (ids []int, err error) {
 	var list []*Classify