|
@@ -110,6 +110,8 @@ public class EventCatalogueController extends BaseESController {
|
|
BoolQueryBuilder builderOr = QueryBuilders.boolQuery();
|
|
BoolQueryBuilder builderOr = QueryBuilders.boolQuery();
|
|
builderOr.should().add(QueryBuilders.termQuery("eventStatusValue.keyword", "forest_event_status_1"));
|
|
builderOr.should().add(QueryBuilders.termQuery("eventStatusValue.keyword", "forest_event_status_1"));
|
|
builderOr.should().add(QueryBuilders.termQuery("eventStatusValue.keyword", "forest_event_status_7"));
|
|
builderOr.should().add(QueryBuilders.termQuery("eventStatusValue.keyword", "forest_event_status_7"));
|
|
|
|
+ builderOr.should().add(QueryBuilders.termQuery("eventStatusValue.keyword", "forest_event_status_3"));
|
|
|
|
+ builderOr.should().add(QueryBuilders.termQuery("eventStatusValue.keyword", "forest_event_status_4"));
|
|
builder.must(builderOr);
|
|
builder.must(builderOr);
|
|
queryBuilderOr.should().add(builder);
|
|
queryBuilderOr.should().add(builder);
|
|
}
|
|
}
|
|
@@ -121,6 +123,8 @@ public class EventCatalogueController extends BaseESController {
|
|
BoolQueryBuilder builderOr = QueryBuilders.boolQuery();
|
|
BoolQueryBuilder builderOr = QueryBuilders.boolQuery();
|
|
builderOr.should().add(QueryBuilders.termQuery("eventStatusValue.keyword", "forest_event_status_1"));
|
|
builderOr.should().add(QueryBuilders.termQuery("eventStatusValue.keyword", "forest_event_status_1"));
|
|
builderOr.should().add(QueryBuilders.termQuery("eventStatusValue.keyword", "forest_event_status_7"));
|
|
builderOr.should().add(QueryBuilders.termQuery("eventStatusValue.keyword", "forest_event_status_7"));
|
|
|
|
+ builderOr.should().add(QueryBuilders.termQuery("eventStatusValue.keyword", "forest_event_status_3"));
|
|
|
|
+ builderOr.should().add(QueryBuilders.termQuery("eventStatusValue.keyword", "forest_event_status_4"));
|
|
builder.must(builderOr);
|
|
builder.must(builderOr);
|
|
queryBuilderOr.should().add(builder);
|
|
queryBuilderOr.should().add(builder);
|
|
}
|
|
}
|