Merge branch 'dev/v4.8.28_dx' of qmx/jy into release/v4.8.28

src/jfw/modules/bigmember/src/service/analysis/decision.go

@@ -751,6 +751,9 @@ func getDecInfo(decQuery, buyer_buyerClass string, dec *DecParam, buyerSty int)
 			if len(bs) > 0 {
 				json.Unmarshal(bs, &aggsMap)
 				if len(aggsMap) > 0 {
+					if len(aggsMap) > 10 {
+						aggsMap = aggsMap[:10]
+					}
 					var _aggsMap = []map[string]interface{}{}
 					for k, v := range aggsMap {
 						if !entity.RegExperts.MatchString(qutil.ObjToString(v["key"])) {
@@ -801,6 +804,9 @@ func getDecInfo(decQuery, buyer_buyerClass string, dec *DecParam, buyerSty int)
 				var winners = []string{}
 				json.Unmarshal(bs, &aggsMap)
 				if len(aggsMap) > 0 {
+					if len(aggsMap) > 10 {
+						aggsMap = aggsMap[:10]
+					}
 					var buckets = []*DecWinnerInfo{}
 					for _, v := range aggsMap {
 						//if !entity.RegWinner.MatchString(qutil.ObjToString(v["key"])) {

src/jfw/modules/bigmember/src/service/analysis/esquery.go

@@ -59,7 +59,7 @@ func DecQuery(area map[string]interface{}, business_scope []ViewKeyWord, buyer,
 	//var query_aggs_winners_aggs_buyer = `"group_projectname":{"terms":{"field":"buyer","size":3}},"this_buyer":{"filter":{"query_string": {"default_field": "buyer","query": "*%s*"}},"aggs":{"total":{"sum":{"field":"sortprice"}},"my_top_hits":{"top_hits":{"size":20,"sort":{"jgtime":"desc"},"_source":["id","jgtime"]}}}}`
 	//var query_aggs_winners = `"group_winner":{"terms":{"field":"s_winner","size":10,"order": [{"total": "desc"}]},"aggs":{"recent_project": {"top_hits": {"size": 1,"sort": {"jgtime": "desc"},"_source": ["id","projectname","jgtime","bidamount"]}},"total":{"sum":{"field":"sortprice"}},"max_jytime": {"max": {"field": "jgtime"}},"group_entidlist":{"terms":{"field":"entidlist","size":1}}%s}}`
 
-	var query = `{"query":{"bool":{"must":[{"bool":{"must":[%s]}},{"bool":{"should":[%s],"minimum_should_match":%d}}]}}, "aggs":{%s}}`
+	var query = `{"query":{"bool":{"must":[{"bool":{"must":[%s]}},{"bool":{"should":[%s],"minimum_should_match":%d}}]}}, "aggs":{%s},"size":0}`
 
 	//标书周期
 	var query_aggs_bidcycle = `"bidcycle_ranges": {"range": {"field": "bidcycle","ranges": [%s]}}`
@@ -214,7 +214,7 @@ func AnalyzeNumber(area map[string]interface{}, business_scope []ViewKeyWord, bu
                 "buyer_count": {"filter": {"bool": {"must": [{"query_string": {"default_field": "buyer","query": "*%s*"}}]}},"aggs": {"all_counts": {"cardinality": {"field": "id"}}}},
                 "area_count": {"filter": {"bool": {"must": [%s]}},"aggs": {"all_counts": {"cardinality": {"field": "id"}}}}`, buyer, strings.Join(areaCity, ","))
 
-	var query = `{"query":{"bool":{"must":[{"bool":{"must":[%s]}},{"bool":{"should":[%s],"minimum_should_match":%d}}]}}, "aggs":{%s}}`
+	var query = `{"query":{"bool":{"must":[{"bool":{"must":[%s]}},{"bool":{"should":[%s],"minimum_should_match":%d}}]}}, "aggs":{%s},"size":0}`
 	//检索日期
 	if limitTime != "" {
 		var (
@@ -296,9 +296,9 @@ func AnalyzeNumber(area map[string]interface{}, business_scope []ViewKeyWord, bu
 func DecWinnerQuery(area map[string]interface{}, business_scope []ViewKeyWord, buyer, limitTime string, searchItem, hotWinnerType int) string {
 	//类似项目热点中标企业
 	//var query_aggs_winners_aggs_buyer = `"group_projectname":{"terms":{"field":"buyer","size":3}},"this_buyer":{"filter":{"query_string": {"default_field": "buyer","query": "*%s*"}},"aggs":{"total":{"sum":{"field":"sortprice"}},"my_top_hits":{"top_hits":{"size":20,"sort":{"jgtime":"desc"},"_source":["id","jgtime"]}}}}`
-	var query_aggs_winners = `"group_winner":{"terms":{"field":"s_winner","exclude":["-",""],"size":10%s},"aggs":{"recent_project": {"top_hits": {"size": 1,"sort": {"jgtime": "desc"},"_source": ["id","projectname","jgtime","bidamount"]}},"total":{"sum":{"field":"sortprice"}},"max_jytime": {"max": {"field": "jgtime"}},"group_entidlist":{"terms":{"field":"entidlist","exclude":["-",""],"size":1}}}}`
+	var query_aggs_winners = `"group_winner":{"terms":{"field":"s_winner","exclude":["-",""],"size":50 %s},"aggs":{"recent_project": {"top_hits": {"size": 1,"sort": {"jgtime": "desc"},"_source": ["id","projectname","jgtime","bidamount"]}},"total":{"sum":{"field":"sortprice"}},"max_jytime": {"max": {"field": "jgtime"}},"group_entidlist":{"terms":{"field":"entidlist","exclude":["-",""],"size":1}}}}`
 
-	var query = `{"query":{"bool":{"must":[{"bool":{"should":[%s],"must":[%s]}},{"bool":{"should":[%s],"minimum_should_match":%d}}]}},"aggs":{%s}}`
+	var query = `{"query":{"bool":{"must":[{"bool":{"should":[%s],"must":[%s]}},{"bool":{"should":[%s],"minimum_should_match":%d}}]}},"aggs":{%s},"size":0}`
 
 	//标书周期
 	//var query_aggs_bidcycle = `"bidcycle_ranges": {"range": {"field": "bidcycle","ranges": [%s]}}`
@@ -427,7 +427,7 @@ func DecReviewExpertsQuery(area map[string]interface{}, business_scope []ViewKey
 	musts := []string{}
 	shoulds := []string{}
 	//聚合查询
-	query_aggs := `"group_review_experts":{"terms":{"field":"review_experts","size":10},"aggs":{"recent_project": {"top_hits": {"size": 1,"sort": {"jgtime": "desc"},"_source": ["jgtime"]}}}}`
+	query_aggs := `"group_review_experts":{"terms":{"field":"review_experts","size":50},"aggs":{"recent_project": {"top_hits": {"size": 1,"sort": {"jgtime": "desc"},"_source": ["jgtime"]}}}}`
 
 	if searchItem == 1 { //采购单位同类型检索
 		//项目采购单位 模糊匹配