fix:es排序修改

src/jfw/front/swordfish.go

@@ -35,7 +35,7 @@ import (
 var (
 	bidSearch_field_1    = `"_id","title","publishtime","toptype","subtype","type","area","dataweight","city","s_subscopeclass","bidamount","budget","buyerclass","spidercode","site"`
 	bidSearch_field      = bidSearch_field_1 + `,"bidopentime","winner","buyer","projectname","projectcode","projectinfo"`
-	bidSearch_sort       = `{"_score":-1,"publishtime":-1}`
+	bidSearch_sort       = `{"dataweight":-1,"publishtime":-1}`
 	bidSearch_field_file = `,"filetext","isValidFile"`
 )
 

src/jfw/modules/common/src/qfw/util/bidsearch/search.go

@@ -18,7 +18,7 @@ import (
 const (
 	INDEX          = "bidding"
 	TYPE           = "bidding"
-	bidSearch_sort = `{"_score":-1,"publishtime":-1}`
+	bidSearch_sort = `{"dataweight":-1,"publishtime":-1}`
 
 	//招标搜索分页--每页显示数量
 	SearchPageSize_APP = 50
@@ -248,8 +248,8 @@ func DetailTitle(findfields string) bool {
 }
 func GetSearchQuery(keyword, industry, minprice, maxprice, hasBuyerTel, hasWinnerTel, fileExists, findfields, mustquery, notkey string, searchTypeSwitch bool) (qstr string) {
 	multi_match := `{"multi_match": {"query": "%s","type": "phrase", "fields": [%s]}}`
-	//query := `{"query":{"bool":{"must":[%s],"must_not":[%s]}}}`
-	query := `{"query": {"function_score": {"query": {"bool": {"must": [%s],"must_not": [%s]}},"field_value_factor": {"field": "dataweight","modifier": "ln1p","missing": 0}}}}`
+	query := `{"query":{"bool":{"must":[%s],"must_not":[%s]}}}`
+	//query := `{"query": {"function_score": {"query": {"bool": {"must": [%s],"must_not": [%s]}},"field_value_factor": {"field": "dataweight","modifier": "ln1p","missing": 0}}}}`
 	query_bool_should := `{"bool":{"should":[%s],"minimum_should_match": 1}}`
 	query_bools_must := `{"bool":{"must":[{"range":{"bidamount":{%s}}}]}},{"bool":{"must":[{"range":{"budget":{%s}}}],"must_not":[{"range":{"bidamount":{"gte":-1}}}]}}`
 	query_bool_must := `{"bool":{"must":[{"terms":{"s_subscopeclass":[%s]}}]}}`

src/jfw/modules/common/src/qfw/util/dataexport/dataexport.go

@@ -91,8 +91,8 @@ func getDataExportSql(scd *SieveCondition) string {
 		return fmt.Sprintf(query, doSearchSql)
 	}
 	multi_match := `{"multi_match": {"query": %s,"type": "phrase", "fields": [%s]}}`
-	//query := `{"query":{"bool":{"must":[%s],"must_not":[%s],"should":[%s],"minimum_should_match": %d}}}`
-	query := `{"query": {"function_score": {"query": {"bool": {"must": [%s],"must_not": [%s],"should": [%s],"minimum_should_match": %d}},"field_value_factor": {"field": "dataweight","modifier": "ln1p","missing": 0}}}}`
+	query := `{"query":{"bool":{"must":[%s],"must_not":[%s],"should":[%s],"minimum_should_match": %d}}}`
+	//query := `{"query": {"function_score": {"query": {"bool": {"must": [%s],"must_not": [%s],"should": [%s],"minimum_should_match": %d}},"field_value_factor": {"field": "dataweight","modifier": "ln1p","missing": 0}}}}`
 	query_bool_should := `{"bool":{"should":[%s],"minimum_should_match": 1}}`
 	query_price := `{"bool":{"must":[{"range":{"bidamount":{%s}}}]}},{"bool":{"must":[{"range":{"budget":{%s}}}],"must_not":[{"range":{"bidamount":{"gte":-1}}}]}}`
 	query_bool_must := `{"terms":{"%s":[%s]}}`
@@ -919,7 +919,7 @@ func doSearch(sql string, start, count int, dataType string) *[]map[string]inter
 			sql = sql[:len(sql)-1] + `,"_source":[` + dataexport_field + "]}"
 		}
 		//分页排序
-		sql = sql[:len(sql)-1] + `,"sort": {"_score": "desc","publishtime":"desc","id":"desc"},"from":` + strconv.Itoa(start) + `,"size":` + strconv.Itoa(count) + "}"
+		sql = sql[:len(sql)-1] + `,"sort": {"dataweight": "desc","publishtime":"desc","id":"desc"},"from":` + strconv.Itoa(start) + `,"size":` + strconv.Itoa(count) + "}"
 	}
 	log.Println("doSearch", sql)
 	return elastic.Get(INDEX, TYPE, sql)