ziwen 2 years ago
parent
commit
d74b710e2a
2 changed files with 9 additions and 2 deletions
  1. 3 0
      controllers/activity.go
  2. 6 2
      controllers/report.go

+ 3 - 0
controllers/activity.go

@@ -2977,6 +2977,9 @@ func (this *ActivityCoAntroller) CheckAsk() {
 // @Param   ActivityTypeIds   query   string  false     "活动类型id 多个用 , 隔开"
 // @Param   ActiveState   query   string  false       "活动进行状态 未开始:1、进行中2、已结束3"
 // @Param   WhichDay   query   string  false       "哪一天 今天:1、明天:2,多个用 , 隔开"
+// @Param   WhichWeek   query   string  false       "哪一周 本周:1 上周:2"
+// @Param   WhichMonth   query   string  false       "哪一月 本月:1 上月:2"
+// @Param   WhichMonth   query   string  false       "哪一月 本月:1 上月:2"
 // @Param   IsPower   query   int  false       "是否选择有权限行业 ,1是 0 否 默认0"
 // @Success 200 {object} models.ActivityTypeListHomeResp
 // @router /labelTypeListV5 [get]

+ 6 - 2
controllers/report.go

@@ -3062,6 +3062,7 @@ func (this *ReportController) StockNameList() {
 		br.ErrMsg = "获取综述报告公司名称失败,Err:" + err.Error()
 		return
 	}
+	var respList []*models.SummaryArticleStock
 	for _, item := range list {
 		sliceSubjects := strings.Split(item.Stock, "/")
 		if len(sliceSubjects) > 0 {
@@ -3075,13 +3076,16 @@ func (this *ReportController) StockNameList() {
 						ArticleId: item.ArticleId,
 						Stock:     subject,
 					}
-					list = append(list, &newItem)
+
+					respList = append(respList, &newItem)
 				} else {
 					item.Stock = subject
+					respList = append(respList, item)
 				}
 			}
 		}
 
+
 		//index := strings.Index(item.Stock, "(")
 		//item.Stock = item.Stock[:index]
 		//if strings.Contains(item.Stock, "-B"){
@@ -3092,7 +3096,7 @@ func (this *ReportController) StockNameList() {
 		//}
 	}
 	resp := new(models.SummaryArticleStockResp)
-	resp.List = list
+	resp.List = respList
 	br.Ret = 200
 	br.Success = true
 	br.Msg = "获取成功"