Merge branch 'feature/v1.0.1_wky' of jianyu/leadGeneration into feature/v1.0.1

entity/search/commonSearch.go

@@ -24,7 +24,7 @@ func (mae *MarketAnalysisEntity) GetCommonQuerySql() string {
 		name = "publishtime"
 	}
 
-	musts = append(musts, fmt.Sprintf(`{"range":{"%s":{"gte":%d}}}`, name, mae.FormatParam.STime))
+	musts = append(musts, fmt.Sprintf(`{"range":{"%s":{"gte":%d}}}`, name, 1576700120))
 
 	//地区
 	/*if len(mae.FormatParam.Area) > 0 || len(mae.FormatParam.City) > 0 {

entity/search/marketAnalysisEntity.go

@@ -2,8 +2,8 @@ package search
 
 const (
 	//客户分布
-	aggs_buyerclass = `"buyerclass_scale":{"terms":{"field":"buyerclass","exclude":["其它",""]},"aggs":{"buyerclass_amount":{"sum":{"field":"sortprice"}},"buyerclass_total":{"filter":{}}}}`
-	project_count   = `"project_count":{"filter": {}}`
+	aggs_buyerclass = `"buyerclass_scale":{"terms":{"field":"buyerclass","exclude":["其它",""]},"aggs":{"buyerclass_amount":{"sum":{"field":"sortprice"}},"buyerclass_total":{"filter":{"match_all": {}}}}}`
+	project_count   = `"project_count":{"filter": {"match_all": {}}}`
 	//超前项目数量s
 	projectsNumber     = `"projects_number":{"terms":{"field":"subtype"}}`
 	projectsSortSource = `,"sort": [{"publishtime":"desc"}],"_source": ["_id","title"]`