|
@@ -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, "(")
|