es

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

@@ -180,8 +180,7 @@ public class OrderBaseEsLogic {
                 if (StringUtils.isBlank(value))
                     continue;
 
-                if (paramBean.getParam().equals("order_status")
-                        && value.equals("DYY")
+                if (param.equals("order_status") && value.equals("DYY")
                 ){
 
                     queryBuilder.mustNot(QueryBuilders.existsQuery("appointment_time"));
@@ -191,7 +190,7 @@ public class OrderBaseEsLogic {
                     continue;
                 }
 
-                if (paramBean.getParam().equals("order_status")
+                if (param.equals("order_status")
                         &&  value.equals("YCD")
                 ){
                     queryBuilder.must(QueryBuilders.termQuery("is_exception",true));
@@ -199,7 +198,7 @@ public class OrderBaseEsLogic {
                     continue;
                 }
 
-                if (paramBean.getParam().equals("order_status")
+                if (param.equals("order_status")
                         && value.equals("DJD")
                 ){
 
@@ -211,14 +210,14 @@ public class OrderBaseEsLogic {
                 }
 
 
-                if (paramBean.getParam().equals("order_status")
+                if (param.equals("order_status")
                         && value.equals("PJSQZ")
                 ){
                     queryBuilder.must(QueryBuilders.termQuery("parts_apply_status","ING"));
                     continue;
                 }
 
-                if (paramBean.getParam().equals("order_status")
+                if (param.equals("order_status")
                         && value.equals("PJYDH")
                 ){
                     queryBuilder.must(QueryBuilders.termQuery("parts_apply_status","END"));
@@ -226,7 +225,7 @@ public class OrderBaseEsLogic {
                 }
 
 
-                if (paramBean.getParam().equals("order_status")
+                if (param.equals("order_status")
                         && value.equals("PJYQX")
                 ){
                     queryBuilder.must(QueryBuilders.termQuery("parts_apply_status","CANCEL"));