Эх сурвалжийг харах

fix:完善研报列表查询

zqbao 9 сар өмнө
parent
commit
0dd7c1bf12

+ 8 - 1
controllers/report.go

@@ -49,6 +49,7 @@ func (this *ReportController) Detail() {
 // @Description 研报列表
 // @Param   ReportId   query   int  true       "报告id"
 // @Param   chartPermissionId   query   int  true       "品种ID"
+// @Param   Level   query   int  true       "品种层级"
 // @Param   PageSize   query   int  true       "每页数据条数"
 // @Param   CurrentIndex   query   int  true       "当前页页码,从1开始"
 // @Success 200 {object} models.ReportDetailResp
@@ -63,12 +64,18 @@ func (this *ReportController) List() {
 	pageSize, _ := this.GetInt("PageSize")
 	currentIndex, _ := this.GetInt("CurrentIndex")
 	chartPermissionId, _ := this.GetInt("ChartPermissionId")
-	reports, err := services.GetReportList(chartPermissionId, currentIndex, pageSize)
+	level, _ := this.GetInt("Level")
+	reports, err := services.GetReportList(chartPermissionId, level, currentIndex, pageSize)
 	if err != nil {
 		br.Msg = "研报列表查询失败"
 		br.ErrMsg = "研报列表查询失败,系统异常,Err:" + err.Error()
 		return
 	}
+	if reports.Ret != 200 {
+		br.Msg = "研报列表查询失败"
+		br.ErrMsg = reports.ErrMsg
+		return
+	}
 
 	br.Data = reports.Data
 	br.Msg = "查询成功"

+ 12 - 0
models/chart_permission_search_key_word_mapping.go

@@ -0,0 +1,12 @@
+package models
+
+import "github.com/beego/beego/v2/client/orm"
+
+func GetClassifyIdsList(chartPermissionId int) (classifyIds []int, err error) {
+	o := orm.NewOrmUsingDB("rddp")
+	sql := ` SELECT classify_id
+		FROM chart_permission_search_key_word_mapping	
+		WHERE chart_permission_id = ? `
+	_, err = o.Raw(sql, chartPermissionId).QueryRows(&classifyIds)
+	return
+}

+ 2 - 2
services/report.go

@@ -25,9 +25,9 @@ type ReportResp[T any] struct {
 	ErrMsg string
 }
 
-func GetReportList(chartPermissionId, currentIndex, pageSize int) (resp *ReportResp[ReportList], err error) {
+func GetReportList(chartPermissionId, level, currentIndex, pageSize int) (resp *ReportResp[ReportList], err error) {
 	url := utils.ETA_MINI_BRIDGE_URL + "/report/list?"
-	url += fmt.Sprintf("?ChartPermissionId=%d&PageSize=%d&CurrentIndex=%d", chartPermissionId, pageSize, currentIndex)
+	url += fmt.Sprintf("ChartPermissionId=%d&Level=%d&PageSize=%d&CurrentIndex=%d", chartPermissionId, level, pageSize, currentIndex)
 	fmt.Println(url)
 	client := &http.Client{}
 	// 提交请求