xingzai 1 rok temu
rodzic
commit
a788198c54
2 zmienionych plików z 6 dodań i 3 usunięć
  1. 2 0
      models/report_selection.go
  2. 4 3
      services/resource_data.go

+ 2 - 0
models/report_selection.go

@@ -16,6 +16,8 @@ type CygxReportSelectionRep struct {
 	IsRed             bool   `description:"是否标记红点"`
 	ReadNum           int    `description:"阅读次数"`
 	SubjectName       string `description:"标的名称"`
+	Periods           string `description:"期数"`
+	MarketStrategy    string `description:"市场策略核心逻辑汇总"`
 }
 
 type CygxReportSelectionListPublicRep struct {

+ 4 - 3
services/resource_data.go

@@ -425,14 +425,15 @@ func GetResourceDataList(condition string, pars []interface{}, startSize, pageSi
 	if lenreportselectionIds > 0 {
 		pars = make([]interface{}, 0)
 		condition = ` AND article_id IN (` + utils.GetOrmInReplace(lenreportselectionIds) + `)`
-		pars = append(pars, lenreportselectionIds)
-
-		listreportselection, e := models.GetReportSelectionList(condition, pars, startSize, pageSize)
+		pars = append(pars, reportselectionIds)
+		listreportselection, e := models.GetReportSelectionList(condition, pars, 0, lenreportselectionIds)
 		if e != nil {
 			err = errors.New("GetReportSelectionList, Err: " + e.Error())
 			return
 		}
 		for _, v := range listreportselection {
+			v.Title += "(第" + v.Periods + "期)"
+			v.MarketStrategy = AnnotationHtml(v.MarketStrategy)
 			v.PublishDate = utils.TimeRemoveHms2(v.PublishDate)
 			mapItems[fmt.Sprint("reportselection", v.ArticleId)].ReportSelection = v
 		}