first

controllers/report.go

@@ -3064,14 +3064,24 @@ func (this *ReportController) StockNameList() {
 		return
 	}
 	for _, item := range list {
-		index := strings.Index(item.Stock, "(")
-		item.Stock = item.Stock[:index]
-		if strings.Contains(item.Stock, "-B"){
-			item.Stock = strings.Replace(item.Stock, "-B", "", -1)
-		}
-		if strings.Contains(item.Stock, "-W"){
-			item.Stock = strings.Replace(item.Stock, "-W", "", -1)
+		sliceSubjects := strings.Split(item.Stock, "/")
+		if len(sliceSubjects) > 0 {
+			for _, vSubject := range sliceSubjects {
+				sliceKuohao := strings.Split(vSubject, "(")           //过滤括号
+				sliceXiahuaxian := strings.Split(sliceKuohao[0], "-") //过滤下划线
+				subject := sliceXiahuaxian[0]
+				item.Stock = subject
+			}
 		}
+
+		//index := strings.Index(item.Stock, "(")
+		//item.Stock = item.Stock[:index]
+		//if strings.Contains(item.Stock, "-B"){
+		//	item.Stock = strings.Replace(item.Stock, "-B", "", -1)
+		//}
+		//if strings.Contains(item.Stock, "-W"){
+		//	item.Stock = strings.Replace(item.Stock, "-W", "", -1)
+		//}
 	}
 	resp := new(models.SummaryArticleStockResp)
 	resp.List = list