检索统计调试

src/main/java/cn/cslg/pas/common/utils/parseQueryToTree/expressManager.java

@@ -39,7 +39,7 @@ public class expressManager {
         oOR.Code = "TO";
         oOR.ShowName = "TO";
         oOR.type = enuType.Logic;
-        oOR.priorityVale = 13;
+        oOR.priorityVale = 21;
         oOR.operateValue = 2;
         hSymbols.put(oOR.Code, oOR);
 
@@ -47,7 +47,7 @@ public class expressManager {
         oOR.Code = "~";
         oOR.ShowName = "TO";
         oOR.type = enuType.Logic;
-        oOR.priorityVale = 13;
+        oOR.priorityVale = 21;
         oOR.operateValue = 2;
         hSymbols.put(oOR.Code, oOR);
 

src/main/java/cn/cslg/pas/factorys/EsCountAnalyseBuilderFactory/ChildCountAnalysisBuilder.java

@@ -45,10 +45,8 @@ public class ChildCountAnalysisBuilder implements IEsCountAnalysisBuilder {
                     queryList.add(query);
                 } else if (StringUtils.isNotEmpty(valueOne) && StringUtils.isNotEmpty(valueTwo)) {
                     //日期/数字
-                    String start = valueOne.substring(0, valueOne.indexOf("-"));
-                    String end = valueOne.substring(valueOne.indexOf("-") + 1);
                     Query query = QueryBuilders.range(range -> range.field("custom_field.stats_value.raw")
-                            .gte(JsonData.of(start)).lte(JsonData.of(end)));
+                            .gte(JsonData.of(valueOne)).lte(JsonData.of(valueTwo)));
                     queryList.add(query);
                 }
                 Aggregation filterAgg = AggregationBuilders.filter(n -> n.bool(k -> k.must(queryList)));
@@ -69,15 +67,8 @@ public class ChildCountAnalysisBuilder implements IEsCountAnalysisBuilder {
                     queryList.add(query);
                 } else if (StringUtils.isNotEmpty(valueOne) && StringUtils.isNotEmpty(valueTwo)) {
                     //日期/数字
-                    if (fieldType.equals(0)) {
-
-                    } else if (fieldType.equals(1)) {
-
-                    }
-                    String start = valueOne.substring(0, valueOne.indexOf("-"));
-                    String end = valueOne.substring(valueOne.indexOf("-") + 1);
                     Query query = QueryBuilders.range(range -> range.field("custom_field.field_value.raw")
-                            .gte(JsonData.of(start)).lte(JsonData.of(end)));
+                            .gte(JsonData.of(valueOne)).lte(JsonData.of(valueTwo)));
                     queryList.add(query);
                 }
                 Aggregation filterAgg = AggregationBuilders.filter(n -> n.bool(k -> k.must(queryList)));

src/main/java/cn/cslg/pas/service/business/es/EsService.java

@@ -266,18 +266,6 @@ public class EsService {
 
     public void appendStr(EsCustomFieldValueDTO customField, StringBuilder builder, int m, boolean ifHaveChild) {
         builder.append("field").append("=").append(customField.getFieldId());
-        String fieldType = customField.getFieldType();
-        if (StringUtils.isNotEmpty(fieldType)) {
-            if (fieldType.equals("Integer")) {
-                fieldType = "0";
-                builder.append(" ").append("and").append(" ")
-                        .append("fieldType").append("=").append(fieldType);
-            } else if (fieldType.equals("DateTime")) {
-                fieldType = "1";
-                builder.append(" ").append("and").append(" ")
-                        .append("fieldType").append("=").append(fieldType);
-            }
-        }
         List<String> values = customField.getFieldValue();
         if (!CollectionUtils.isEmpty(values)) {
             builder.append(" ").append("and").append(" ");