Browse Source

fix:提交动态查询字段修改

wangkaiyue 3 years ago
parent
commit
933c664b0e

+ 1 - 1
src/jfw/modules/bigmember/src/entity/portraitWinnerSearch.go

@@ -152,7 +152,7 @@ func GetWinnerPortraitSearch(screen *PortraitScreen) (map[string]interface{}, er
 	tBegin := time.Now()
 	doSearchSql := fmt.Sprintf(winnerPortraitSearchSql, strings.Join(mustQueryArr, ","), comminTimeRange, comminTimeRange, bidamountTimeRange)
 	res, docCount := util.GetAggs("projectset", "projectset", doSearchSql)
-	log.Println("winnerPortraitSql", doSearchSql)
+	//log.Println("winnerPortraitSql", doSearchSql)
 	if res == nil {
 		return nil, errors.New(fmt.Sprintf("%s中标企业画像查询异常\n", screen.Ent))
 	}

+ 5 - 1
src/jfw/modules/bigmember/src/entity/portrait_screen.go

@@ -186,7 +186,11 @@ func (pwp *PortraitProjectScreen) CommonPare(isWinner bool) (mustQueryArr []stri
 
 	//行业多选
 	if pwp.Screen.ScopeClass != "" {
-		mustQueryArr = append(mustQueryArr, fmt.Sprintf(`{"terms":{"subscopeclass":["%s"]}}`, strings.ReplaceAll(pwp.Screen.ScopeClass, ",", "\",\"")))
+		if isWinner {
+			mustQueryArr = append(mustQueryArr, fmt.Sprintf(`{"terms":{"s_subscopeclass":["%s"]}}`, strings.ReplaceAll(pwp.Screen.ScopeClass, ",", "\",\"")))
+		} else {
+			mustQueryArr = append(mustQueryArr, fmt.Sprintf(`{"terms":{"subscopeclass":["%s"]}}`, strings.ReplaceAll(pwp.Screen.ScopeClass, ",", "\",\"")))
+		}
 	}
 
 	//按照当前年份,往前推4年,共5个年份可选