研报列表

controller/report/report.go

@@ -250,3 +250,41 @@ func ReportPptImgList(c *gin.Context) {
 	response.OkData("获取成功", pptImgList, c)
 	return
 }
+
+// CommoditiesCollectReportList 大宗商品研报列表
+func CommoditiesCollectReportList(c *gin.Context) {
+	reqChartPermissionId := c.DefaultQuery("chart_permission_id", "")
+	reqPageIndex := c.DefaultQuery("current_index", "1")
+	reqPageSize := c.DefaultQuery("page_size", strconv.Itoa(utils.PageSize20))
+
+	pageIndex, err := strconv.Atoi(reqPageIndex)
+	if err != nil {
+		response.Fail("请输入正确的条数限制", c)
+		return
+	}
+
+	pageSize, err := strconv.Atoi(reqPageSize)
+	if err != nil {
+		response.Fail("请输入正确的页码", c)
+		return
+	}
+
+	if reqChartPermissionId == "" {
+		response.Fail("请输入权限ID", c)
+		return
+	}
+	chartPermissionId, err := strconv.Atoi(reqChartPermissionId)
+	if err != nil {
+		response.Fail("权限ID格式错误", c)
+		return
+	}
+	userinfo := userService.GetInfoByClaims(c)
+
+	list, err := report.GetCollectReportList(userinfo, chartPermissionId, pageIndex, pageSize)
+	if err != nil {
+		response.FailMsg("汇总报告查询出错", err.Error(), c)
+		return
+	}
+	response.OkData("查询成功", list, c)
+	return
+}

routers/report.go

@@ -16,6 +16,7 @@ func InitReport(r *gin.Engine) {
 	rGroup.GET("/search", report.Search)
 	rGroup.POST("/detail/rddp_share_img", report.RddpShareImg)
 	rGroup.GET("/ppt_img", report.ReportPptImgList)
+	rGroup.GET("/commodities/collect", report.CommoditiesCollectReportList)
 
 	rGroup2 := r.Group("api/classify").Use(middleware.Token())
 	rGroup2.GET("/ficc", report.ClassifyFirstList)

services/report/classify.go

@@ -291,6 +291,8 @@ func GetClassifySecondSimpleList(user user.UserInfo, classifyIdFirst int) (list
 			temp.ClassifyNameSecond = item.ClassifyName
 			if index := strings.Index(item.ClassifyName, "双周报"); index > 0{
 				temp.ClassifySecondNameSimple = item.ClassifyName[0 : index]
+			} else if item.ClassifyName == "纺织服装与商品价格"{
+				temp.ClassifySecondNameSimple = "纺织服装"
 			}else{
 				temp.ClassifySecondNameSimple = item.ClassifyName
 			}