ziwen 2 years ago
parent
commit
5d86c142e1
1 changed files with 23 additions and 5 deletions
  1. 23 5
      controllers/report.go

+ 23 - 5
controllers/report.go

@@ -3066,12 +3066,30 @@ func (this *ReportController) StockNameList() {
 	for _, item := range list {
 		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
+			if len(sliceSubjects) == 1{
+				for _, vSubject := range sliceSubjects {
+					sliceKuohao := strings.Split(vSubject, "(")           //过滤括号
+					sliceXiahuaxian := strings.Split(sliceKuohao[0], "-") //过滤下划线
+					subject := sliceXiahuaxian[0]
+					item.Stock = subject
+				}
+			} else {
+				for i, vSubject := range sliceSubjects {
+					sliceKuohao := strings.Split(vSubject, "(")           //过滤括号
+					sliceXiahuaxian := strings.Split(sliceKuohao[0], "-") //过滤下划线
+					subject := sliceXiahuaxian[0]
+					item.Stock = subject
+					if i> 0{
+						newItem := models.SummaryArticleStock{
+							Id:        item.Id,
+							ArticleId: item.ArticleId,
+							Stock:     subject,
+						}
+						list = append(list, &newItem)
+					}
+				}
 			}
+
 		}
 
 		//index := strings.Index(item.Stock, "(")