Merge remote-tracking branch 'origin/develop_tzs_register_to_0715' into…

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/JGDPStatisticsServiceImpl.java

@@ -727,7 +727,7 @@ public class JGDPStatisticsServiceImpl {
         boolMust.must(QueryBuilders.termsQuery("EQU_LIST_CODE", StCommonServiceImpl.getEquipmentCategory().stream().map(EquipmentCategoryDto::getCode).collect(Collectors.toList())));
         SearchSourceBuilder builder = new SearchSourceBuilder();
         builder.query(boolMust);
-        TermsAggregationBuilder aggregationBuilder = AggregationBuilders.terms("EQU_STATE_COUNT").field("EQU_STATE").size(20);
+        TermsAggregationBuilder aggregationBuilder = AggregationBuilders.terms("EQU_STATE_COUNT").field("EQU_STATE").size(20).missing(EquimentEnum.WEIDENGJI.getCode());
         builder.aggregation(aggregationBuilder);
         builder.size(0);
         request.source(builder);
@@ -740,7 +740,7 @@ public class JGDPStatisticsServiceImpl {
                 long docCount = bucket.getDocCount();
                 dataMap.put(category, docCount);
             }
-            resultList = Arrays.stream(EquimentEnum.values()).filter(e -> e.getCode() > 0).map(e -> {
+            resultList = Arrays.stream(EquimentEnum.values()).map(e -> {
                 Map<String, Object> map = new HashMap<>();
                 map.put("name", e.getName());
                 map.put("value", dataMap.getOrDefault(e.getCode().toString(), 0L));