fix:统一参数名，修复添加阅读记录

controllers/my_chart.go

@@ -158,7 +158,6 @@ func (this *MyChartController) List() {
 
 	resp := new(response.MyChartListResp)
 	if total == 0 {
-		br.Data = resp
 		br.Msg = "暂无数据"
 		br.Ret = 200
 		br.Success = true

controllers/my_report.go

@@ -54,7 +54,6 @@ func (this *MyReportController) List() {
 	}
 	resp := new(response.MyReportListResp)
 	if total == 0 {
-		br.Data = resp
 		br.Msg = "暂无数据"
 		br.Ret = 200
 		br.Success = true
@@ -69,7 +68,7 @@ func (this *MyReportController) List() {
 	}
 	page := paging.GetPaging(currentIndex, pageSize, total)
 	resp.List = reportList
-	resp.Page = page
+	resp.Paging = page
 
 	br.Data = resp
 	br.Success = true

controllers/user.go

@@ -251,12 +251,18 @@ func (this *UserAuthController) AddReportRecord() {
 		br.ErrMsg = "参数错误，报告id小于等于0"
 		return
 	}
-	items, err := models.GetChartPermissionChapterMappingByReportId(req.ReportId)
+	reportResp, err := services.GetReportChartPermissionList(req.ReportId)
 	if err != nil {
 		br.Msg = "添加阅读记录失败"
 		br.ErrMsg = "获取研报品种错误，Err:" + err.Error()
 		return
 	}
+	if reportResp.Ret != 200 {
+		br.Msg = reportResp.Msg
+		br.ErrMsg = reportResp.ErrMsg
+		return
+	}
+	reportPermissionList := reportResp.Data
 	chartPermissionList, err := services.GetChartPermissionAllList()
 	if err != nil {
 		br.Msg = "添加阅读记录失败"
@@ -274,7 +280,7 @@ func (this *UserAuthController) AddReportRecord() {
 		permission1Ids := make([]int, 0)
 		permission2Ids := make([]int, 0)
 		permissionNames := make([]string, 0)
-		for _, item := range items {
+		for _, item := range reportPermissionList {
 			curPermission := chartMap[item.ChartPermissionId]
 			permission1Ids = append(permission1Ids, curPermission.ParentId)
 			permission2Ids = append(permission2Ids, curPermission.ChartPermissionId)

models/chart_permission_chapter_mapping.go

@@ -1,22 +0,0 @@
-package models
-
-import "github.com/beego/beego/v2/client/orm"
-
-type ChartPermissionChapterMappingItem struct {
-	Id                  int    `description:"id"`
-	ChartPermissionId   int    `description:"品种id"`
-	ChartPermissionName string `description:"品种名称"`
-	ReportChapterTypeId int    `description:"报告id"`
-	ResearchType        string `description:"id"`
-}
-
-func GetChartPermissionChapterMappingByReportId(reportId int) (items []*ChartPermissionChapterMappingItem, err error) {
-	o := orm.NewOrmUsingDB("rddp")
-	sql := `SELECT cpcm.*, cp.chart_permission_name 
-	FROM chart_permission_chapter_mapping AS cpcm
-	LEFT JOIN chart_permission AS cp
-	ON cpcm.chart_permission_id = cp.chart_permission_id
-	WHERE report_chapter_type_id=?`
-	_, err = o.Raw(sql, reportId).QueryRows(&items)
-	return
-}

models/response/my_report.go

@@ -7,8 +7,8 @@ import (
 )
 
 type MyReportListResp struct {
-	List []*models.MyReport
-	Page *paging.PagingItem
+	List   []*models.MyReport
+	Paging *paging.PagingItem
 }
 
 type MyReportIsCollectResp struct {

services/chart_permission.go

@@ -73,3 +73,17 @@ func GetChartPermissionAllList() (resp *models.ChartPermissionResp[[]*models.Cha
 	}
 	return
 }
+
+func GetReportChartPermissionList(reportId int) (resp *models.ChartPermissionResp[[]*models.ChartPermission], err error) {
+	url := utils.ETA_MINI_BRIDGE_URL + "/chart_permission/detail"
+	url += fmt.Sprintf("?ReportId=%d", reportId)
+	body, err := HttpGet(url)
+	if err != nil {
+		return
+	}
+	err = json.Unmarshal(body, &resp)
+	if err != nil {
+		return
+	}
+	return
+}