Browse Source

修复事件总览查询缺陷

lyq 1 year ago
parent
commit
d1663a24b1

+ 4 - 0
src/main/java/com/sooka/sponest/middleware/event/eventcatalogue/controller/EventCatalogueController.java

@@ -110,6 +110,8 @@ public class EventCatalogueController extends BaseESController {
                 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_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);
                 queryBuilderOr.should().add(builder);
             }
@@ -121,6 +123,8 @@ public class EventCatalogueController extends BaseESController {
                 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_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);
                 queryBuilderOr.should().add(builder);
             }