分类fix

models/response/pc/report.go

@@ -36,7 +36,7 @@ type RecommendReport struct {
 
 func GetRecommendList(reportId, reportType int) (items []*RecommendReport, err error) {
 	sql := `SELECT * FROM report WHERE state=2 AND id<> %v`
-	sql = fmt.Sprintf(sql,reportId)
+	sql = fmt.Sprintf(sql, reportId)
 	if reportType == 1 {
 		sql += ` AND classify_name_first='权益研报' `
 	} else {
@@ -48,17 +48,29 @@ func GetRecommendList(reportId, reportType int) (items []*RecommendReport, err e
 }
 
 type LatestReport struct {
-	Id                 int    `orm:"column(id)" description:"报告Id" json:"_"`
-	ClassifyNameFirst  string `description:"一级分类名称" json:"classify_name_first"`
-	Title              string `description:"标题" json:"title"`
-	State              int    `description:"1:未发布，2:已发布" json:"state"`
-	PublishTime        time.Time `description:"发布时间" json:"publish_time"`
-	Stage              int    `description:"期数" json:"stage"`
+	Id                int       `orm:"column(id)" description:"报告Id" json:"_"`
+	ClassifyNameFirst string    `description:"一级分类名称" json:"classify_name_first"`
+	Title             string    `description:"标题" json:"title"`
+	State             int       `description:"1:未发布，2:已发布" json:"state"`
+	PublishTime       time.Time `description:"发布时间" json:"publish_time"`
+	Stage             int       `description:"期数" json:"stage"`
 }
 
-func GetLatestStage(classifyNames []string) (items []*LatestReport, err error){
-	sql := `SELECT id,classify_name_first,title,state,publish_time,stage FROM report WHERE classify_name_first IN (?) GROUP BY classify_name_first ORDER BY publish_time DESC`
-	fmt.Println(sql)
-	err = global.MYSQL["rddp"].Raw(sql,classifyNames).Scan(&items).Error
+func GetLatestStage(classifyNames []string) (items []*LatestReport, err error) {
+	sql := `SELECT * FROM(SELECT DISTINCT
+	classify_name_first,
+	id,
+	title,
+	state,
+	publish_time,
+	stage 
+FROM
+	report 
+WHERE
+	classify_name_first IN  (?) 
+AND state = 2 
+ORDER BY
+	publish_time DESC) t GROUP BY t.classify_name_first`
+	err = global.MYSQL["rddp"].Raw(sql, classifyNames).Scan(&items).Error
 	return
-}
+}

services/pc/classify.go

@@ -33,22 +33,22 @@ func GetClassifyFirstList(user user.UserInfo) (list pc.ClassifyFirstList, err er
 
 	// 当前版本一级分类固定
 	classifyIconMap := map[string]string{
-		"晨报": utils.ALIYUN_YBIMG_HOST + "ficc_icon_day_128.png",
-		"周报": utils.ALIYUN_YBIMG_HOST + "ficc_icon_week_128.png",
-		"双周报": utils.ALIYUN_YBIMG_HOST + "ficc_icon_two_week_128.png",
-		"月报": utils.ALIYUN_YBIMG_HOST + "ficc_icon_month_128.png",
-		"草根调研": utils.ALIYUN_YBIMG_HOST + "ficc_icon_grassroots_128.png",
-		"需求报告": utils.ALIYUN_YBIMG_HOST + "ficc_icon_need_report_128.png",
-		"宏观报告": utils.ALIYUN_YBIMG_HOST + "ficc_icon_hongguan_128.png",
-		"日度点评": utils.ALIYUN_YBIMG_HOST + "ficc_icon_daily_comment_128.png",
-		"数据点评": utils.ALIYUN_YBIMG_HOST + "ficc_icon_data_128.png",
-		"碳市场价格周报": utils.ALIYUN_YBIMG_HOST + "ficc_icon_rcarbon_128.png",
-		"行业调研": utils.ALIYUN_YBIMG_HOST + "ficc_icon_research_128.png",
-		"海外视角": utils.ALIYUN_YBIMG_HOST + "ficc_icon_overseas_128.png",
-		"百家谈": utils.ALIYUN_YBIMG_HOST + "ficc_icon_family_128.png",
-		"会议纪要": utils.ALIYUN_YBIMG_HOST + "ficc_icon_meeting_128.png",
-		"大事点评":  utils.ALIYUN_YBIMG_HOST + "ficc_icon_big_thing_128.png",
-		"年报合集": utils.ALIYUN_YBIMG_HOST + "ficc_icon_year_collect_128.png",
+		"晨报": utils.ALIYUN_YBIMG_HOST + "ficc_classify_bg_blue.png",
+		"周报": utils.ALIYUN_YBIMG_HOST + "ficc_classify_bg_blue.png",
+		"双周报": utils.ALIYUN_YBIMG_HOST + "ficc_classify_bg_blue.png",
+		"月报": utils.ALIYUN_YBIMG_HOST + "ficc_classify_bg_blue.png",
+		"草根调研": utils.ALIYUN_YBIMG_HOST + "ficc_classify_bg_orange.png",
+		"需求报告": utils.ALIYUN_YBIMG_HOST + "ficc_classify_bg_green.png",
+		"宏观报告": utils.ALIYUN_YBIMG_HOST + "ficc_classify_bg_green.png",
+		"日度点评": utils.ALIYUN_YBIMG_HOST + "ficc_classify_bg_orange.png",
+		"数据点评": utils.ALIYUN_YBIMG_HOST + "ficc_classify_bg_green.png",
+		"碳市场价格周报": utils.ALIYUN_YBIMG_HOST + "ficc_classify_bg_blue.png",
+		"行业调研": utils.ALIYUN_YBIMG_HOST + "ficc_classify_bg_orange.png",
+		"海外视角": utils.ALIYUN_YBIMG_HOST + "ficc_classify_bg_orange.png",
+		"百家谈": utils.ALIYUN_YBIMG_HOST + "ficc_classify_bg_orange.png",
+		"会议纪要": utils.ALIYUN_YBIMG_HOST + "ficc_classify_bg_green.png",
+		"大事点评":  utils.ALIYUN_YBIMG_HOST + "ficc_classify_bg_orange.png",
+		"年报合集": utils.ALIYUN_YBIMG_HOST + "ficc_classify_bg_green.png",
 	}
 
 	classifySortMap := map[string]int{