|
@@ -92,9 +92,11 @@ public class OrderBaseCountLogic {
|
|
|
.withQuery(queryBuilderCount)
|
|
|
.withPageable(PageRequest.of(1, 1))
|
|
|
.addAggregation(this.getAggs(AggregationBuilders.filter("DJS", QueryBuilders.boolQuery()
|
|
|
- .must(QueryBuilders.boolQuery().should(QueryBuilders.termsQuery("is_meet", false))
|
|
|
- .should(QueryBuilders.termsQuery("order_status", "DJD")))
|
|
|
- .mustNot(QueryBuilders.termsQuery("order_status", "YQX", "FWQX", "FL", "FWZT", "YCGB","YZP"))
|
|
|
+ .must(QueryBuilders.boolQuery().should(QueryBuilders.termsQuery("is_meet", false)))
|
|
|
+ .must(QueryBuilders.termsQuery("order_status", "FWZ"))
|
|
|
+// .must(QueryBuilders.boolQuery().should(QueryBuilders.termsQuery("is_meet", false))
|
|
|
+// .should(QueryBuilders.termsQuery("order_status", "DJD")))
|
|
|
+// .mustNot(QueryBuilders.termsQuery("order_status", "YQX", "FWQX", "FL", "FWZT", "YCGB","YZP"))
|
|
|
)))
|
|
|
.build();
|
|
|
SearchHits responseDJS = this.search(searchQueryDJS,year);
|