Skip to content

A
amos-boot-biz
Commit 77601c9b authored by suhuiguang's avatar suhuiguang
Browse files
Options

Merge branch 'develop_tzs_register' of…

Merge branch 'develop_tzs_register' of http://39.100.92.250:5000/moa/amos-boot-biz into develop_tzs_register
parents 3bf04189 60b84843
Show whitespace changes
Inline Side-by-side
Showing with 4 additions and 10 deletions
amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/java/com/yeejoin/amos/boot/module/statistcs/biz/service/impl/ComprehensiveStatisticalAnalysisServiceImpl.java
View file @ 77601c9b
...@@ -358,15 +358,13 @@ public class ComprehensiveStatisticalAnalysisServiceImpl { ...@@ -358,15 +358,13 @@ public class ComprehensiveStatisticalAnalysisServiceImpl {
} }
} else if (v instanceof String) { } else if (v instanceof String) {
if (k.equals("fuzzyInput")) { if (k.equals("fuzzyInput")) {
if (!"null".equals(v) && !"".equals(v)) { String fuzzyValue = String.valueOf(v);
String fuzzyValue = v.toString();
BoolQueryBuilder queryBuilder = QueryBuilders.boolQuery(); BoolQueryBuilder queryBuilder = QueryBuilders.boolQuery();
queryBuilder.should(QueryBuilders.wildcardQuery("name", "*" + fuzzyValue + "*")); queryBuilder.should(QueryBuilders.wildcardQuery("name", "*" + fuzzyValue + "*"));
queryBuilder.minimumShouldMatch(1); queryBuilder.minimumShouldMatch(1);
boolMust.must(queryBuilder); boolMust.must(queryBuilder);
} }
} }
}
}); });
} else { } else {
JSONArray leftGroup = filterParams.getJSONArray("group1"); JSONArray leftGroup = filterParams.getJSONArray("group1");
...@@ -557,15 +555,13 @@ public class ComprehensiveStatisticalAnalysisServiceImpl { ...@@ -557,15 +555,13 @@ public class ComprehensiveStatisticalAnalysisServiceImpl {
} }
} else if (v instanceof String) { } else if (v instanceof String) {
if (k.equals("fuzzyInput")) { if (k.equals("fuzzyInput")) {
if (!"null".equals(v) && !"".equals(v)) { String fuzzyValue = String.valueOf(v);
String fuzzyValue = v.toString();
BoolQueryBuilder queryBuilder = QueryBuilders.boolQuery(); BoolQueryBuilder queryBuilder = QueryBuilders.boolQuery();
queryBuilder.should(QueryBuilders.wildcardQuery("useUnit", "*" + fuzzyValue + "*")); queryBuilder.should(QueryBuilders.wildcardQuery("useUnit", "*" + fuzzyValue + "*"));
queryBuilder.minimumShouldMatch(1); queryBuilder.minimumShouldMatch(1);
boolMust.must(queryBuilder); boolMust.must(queryBuilder);
} }
} }
}
}); });
} else { } else {
JSONArray leftGroup = filterParams.getJSONArray("group1"); JSONArray leftGroup = filterParams.getJSONArray("group1");
...@@ -759,8 +755,7 @@ public class ComprehensiveStatisticalAnalysisServiceImpl { ...@@ -759,8 +755,7 @@ public class ComprehensiveStatisticalAnalysisServiceImpl {
} }
} else if (v instanceof String) { } else if (v instanceof String) {
if (k.equals("fuzzyInput")) { if (k.equals("fuzzyInput")) {
if (!"null".equals(v) && !"".equals(v)) { String fuzzyValue = String.valueOf(v);
String fuzzyValue = v.toString();
BoolQueryBuilder queryBuilder = QueryBuilders.boolQuery(); BoolQueryBuilder queryBuilder = QueryBuilders.boolQuery();
queryBuilder.should(QueryBuilders.wildcardQuery("EQU_LIST", "*" + fuzzyValue + "*")); queryBuilder.should(QueryBuilders.wildcardQuery("EQU_LIST", "*" + fuzzyValue + "*"));
queryBuilder.should(QueryBuilders.wildcardQuery("EQU_CATEGORY", "*" + fuzzyValue + "*")); queryBuilder.should(QueryBuilders.wildcardQuery("EQU_CATEGORY", "*" + fuzzyValue + "*"));
...@@ -768,7 +763,6 @@ public class ComprehensiveStatisticalAnalysisServiceImpl { ...@@ -768,7 +763,6 @@ public class ComprehensiveStatisticalAnalysisServiceImpl {
queryBuilder.should(QueryBuilders.wildcardQuery("PRODUCT_NAME", "*" + fuzzyValue + "*")); queryBuilder.should(QueryBuilders.wildcardQuery("PRODUCT_NAME", "*" + fuzzyValue + "*"));
queryBuilder.minimumShouldMatch(1); queryBuilder.minimumShouldMatch(1);
boolMust.must(queryBuilder); boolMust.must(queryBuilder);
}
} else if (k.equals("WHETHER_VEHICLE_CYLINDER")) { } else if (k.equals("WHETHER_VEHICLE_CYLINDER")) {
boolMust.must(QueryBuilders.matchQuery(k, v.toString())); boolMust.must(QueryBuilders.matchQuery(k, v.toString()));
} }
...@@ -1578,7 +1572,7 @@ public class ComprehensiveStatisticalAnalysisServiceImpl { ...@@ -1578,7 +1572,7 @@ public class ComprehensiveStatisticalAnalysisServiceImpl {
public JSONArray queryUnitType(String type) { public JSONArray queryUnitType(String type) {
if(ObjectUtils.isEmpty(type)){ if (ObjectUtils.isEmpty(type)) {
return UnitTypeEnum.getAll(); return UnitTypeEnum.getAll();
} }
return UnitTypeEnum.getUnitTypeByType(type); return UnitTypeEnum.getUnitTypeByType(type);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment