es

mall-server-api/src/main/java/com/gree/mall/manager/logic/workorder/OrderBaseEsLogic.java

@@ -183,16 +183,18 @@ public class OrderBaseEsLogic {
                 if (paramBean.getParam().equals("order_status")
                         && value.equals("DYY")
                 ){
-                    queryBuilder.mustNot(QueryBuilders.wildcardQuery("appointment_time","*"));
+
+                    queryBuilder.mustNot(QueryBuilders.existsQuery("appointment_time"));
                     queryBuilder.mustNot(QueryBuilders.termsQuery("order_status", "YWG", "GCSZX", "WDWG", "YWGO", "YQX", "FWZT", "YCGB",
-                            "FWQX", "FL", "YJS", "LRCD", "DSHPG", "CJ", "YPD", "DXSPD", "DZBPG", "DWDSPGP", "DXSSPGP", "DTJXSSPGP", "DZBSPGP"));
+                                    "FWQX", "FL", "YJS", "LRCD", "DSHPG", "CJ", "YPD", "DXSPD", "DZBPG", "DWDSPGP", "DXSSPGP", "DTJXSSPGP", "DZBSPGP"));
+
                     continue;
                 }
 
                 if (paramBean.getParam().equals("order_status")
                         &&  value.equals("YCD")
                 ){
-                    queryBuilder.must(QueryBuilders.termQuery("is_exception","1"));
+                    queryBuilder.must(QueryBuilders.termQuery("is_exception",true));
                     queryBuilder.mustNot(QueryBuilders.termsQuery("order_status", "YWG", "YWGO", "YJS"));
                     continue;
                 }
@@ -200,12 +202,11 @@ public class OrderBaseEsLogic {
                 if (paramBean.getParam().equals("order_status")
                         && value.equals("DJD")
                 ){
-                    should.add(QueryBuilders.termsQuery("is_meet", false));
-                    should.add(QueryBuilders.termsQuery("order_status", "DJD"));
-                    queryBuilder.mustNot(QueryBuilders.termsQuery("order_status",
-                            "YQX", "FWQX", "FL", "FWZT", "YCGB"));
-
 
+                    queryBuilder.must(QueryBuilders.boolQuery()
+                            .mustNot(QueryBuilders.termsQuery("order_status","YQX", "FWQX", "FL", "FWZT", "YCGB"))
+                            .must(QueryBuilders.boolQuery().should(QueryBuilders.termQuery("is_meet", false))
+                                    .should(QueryBuilders.termsQuery("order_status", "DJD"))));
                     continue;
                 }