Merge remote-tracking branch 'origin/develop_tzs_bugfix' into develop_tzs_bugfix

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-api/src/main/java/com/yeejoin/amos/boot/module/statistics/api/enums/PersonAdvanceSearchEnum.java

@@ -23,7 +23,7 @@ public enum PersonAdvanceSearchEnum {
     JOB_ITEM("作业项目", "jobItem",null,"/statistics/comprehensiveStatisticalAnalysis/select/queryZYXM?type={type}",null,"certType"),
     PERMISSION_ITEM("项目", "permissionItem",null,"/statistics/comprehensiveStatisticalAnalysis/select/queryZYXM?type={type}",null,"permissionLevel"),
     ISSUE_DATE("发证日期", "issueDate",TechnicalParameter.ParamType.DATE,"",null,null),
-    EDUCATION("学历", "education",null,"/statistics/comprehensiveStatisticalAnalysis/select/queryDicData","QYRYXL",null),
+    EDUCATION("学历", "education",null,"/statistics/comprehensiveStatisticalAnalysis/select/queryDicData?type={type}","QYRYXL",null),
     ADDRESS("住址", "address",TechnicalParameter.ParamType.STRING,"",null,null),
     UNITCODE("所属企业", "unitCode", TechnicalParameter.ParamType.STRING,"",null,null),
     SUPERVISEORGCODE("管辖机构", "superviseOrgCode",null,"/statistics/comprehensiveStatisticalAnalysis/select/queryUnitByOrgCode?type={type}",null,"orgTreeId"),

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

@@ -975,6 +975,8 @@ public class ComprehensiveStatisticalAnalysisServiceImpl {
         sum.put("value", totle);
         statics.add(sum);
 
+        BoolQueryBuilder pipeQuery = QueryBuilderUtils.copyBoolQuery(boolMust);
+
         List<Map<String, Object>> equipStatusMap = new ArrayList<>();
         getEquipStatusStatic(boolMust, builder, equipStatusMap);
         result.put("keyIndicator", equipStatusMap);
@@ -989,7 +991,7 @@ public class ComprehensiveStatisticalAnalysisServiceImpl {
         JSONArray equList = (JSONArray) filterParams.get("EQU_LIST");
         if (ObjectUtils.isEmpty(equList) || equList.contains("8000") || equList.contains("all")) {
             // 获取压力管道长度
-            BigDecimal pipeLength = getPipeLength(boolMust, builder, "pipeLength");
+            BigDecimal pipeLength = getPipeLength(pipeQuery, "pipeLength");
             Map<String, Object> pipeMap = new HashMap<>();
             pipeMap.put("name", "压力管道（千米）");
             pipeMap.put("value", pipeLength.divide(new BigDecimal(1000), 2, BigDecimal.ROUND_HALF_UP));
@@ -1293,16 +1295,13 @@ public class ComprehensiveStatisticalAnalysisServiceImpl {
         return ObjectUtils.isEmpty(response) ? 0 : response.getCount();
     }
 
-    private BigDecimal getPipeLength(BoolQueryBuilder boolMust, SearchSourceBuilder builder, String countField) {
+    private BigDecimal getPipeLength(BoolQueryBuilder boolMust, String countField) {
         SearchRequest request = new SearchRequest();
         request.indices(StatisticalAnalysisEnum.equip.getKey());
+        SearchSourceBuilder builder = new SearchSourceBuilder();
         BigDecimal pipeLong;
-        BoolQueryBuilder pipeLengthQuery = QueryBuilderUtils.copyBoolQuery(boolMust);
-        pipeLengthQuery.must(QueryBuilders.existsQuery("pipeLength"));
-        pipeLengthQuery.must(existsQuery("SUPERVISORY_CODE"));
-        pipeLengthQuery.mustNot(QueryBuilders.termQuery("SUPERVISORY_CODE",""));
         SumAggregationBuilder pipeLengthAgg = AggregationBuilders.sum(countField).field("pipeLength").missing(0);
-        builder.query(pipeLengthQuery);
+        builder.query(boolMust);
         builder.aggregation(pipeLengthAgg).size(0);
         request.source(builder);
         try {
@@ -3047,6 +3046,7 @@ public class ComprehensiveStatisticalAnalysisServiceImpl {
         if (groupField.equals("EQU_LIST_CODE")) {
             gasBoolQueryBuilder = QueryBuilderUtils.copyBoolQuery(boolMust);
         }
+        BoolQueryBuilder pipeBoolMust = QueryBuilderUtils.copyBoolQuery(boolMust);
         if (!"2300".equals(equipCode)) {
             boolMust.mustNot(QueryBuilders.matchQuery("EQU_CATEGORY_CODE", "2300"));
         }
@@ -3061,9 +3061,7 @@ public class ComprehensiveStatisticalAnalysisServiceImpl {
         tabTotalMap.put(StatisticalAnalysisEnum.equip.getCode(), otherCount.toString());
 
         List<String> codes = new ArrayList<>();
-        BoolQueryBuilder pipeBoolMust = QueryBuilderUtils.copyBoolQuery(boolMust);
         for (Map<String, Object> categoryMap : staticCountByGroupMap) {
-            BoolQueryBuilder queryBuilder = QueryBuilderUtils.copyBoolQuery(pipeBoolMust);
             String code = categoryMap.get("value").toString();
             codes.add(code);
             // 去除类别中的气瓶
@@ -3078,8 +3076,11 @@ public class ComprehensiveStatisticalAnalysisServiceImpl {
             map.put("fieldKey", groupField.replace("_CODE", ""));
             Object value = staticCountByGroup.containsKey(code) ? staticCountByGroup.get(code) : 0L;
             if (code.startsWith("8")) {
-                queryBuilder.must(QueryBuilders.matchQuery(groupField, code));
-                BigDecimal pipeLength = getPipeLength(queryBuilder, builder, code);
+                pipeBoolMust.must(QueryBuilders.termQuery(groupField, code));
+                pipeBoolMust.must(QueryBuilders.existsQuery("pipeLength"));
+                pipeBoolMust.must(existsQuery("SUPERVISORY_CODE"));
+                pipeBoolMust.mustNot(QueryBuilders.termQuery("SUPERVISORY_CODE",""));
+                BigDecimal pipeLength = getPipeLength(pipeBoolMust, code);
                 value = pipeLength.divide(new BigDecimal(1000), 4, BigDecimal.ROUND_HALF_UP);
             }
             map.put("value", value);
@@ -3155,7 +3156,7 @@ public class ComprehensiveStatisticalAnalysisServiceImpl {
             if (groupField.equals("EQU_DEFINE_CODE")) {
                 pipeBoolMust.mustNot(QueryBuilders.termsQuery("EQU_DEFINE_CODE", codes));
             }
-            BigDecimal pipeLength = getPipeLength(pipeBoolMust, builder, "other");
+            BigDecimal pipeLength = getPipeLength(pipeBoolMust, "other");
             BigDecimal divide = pipeLength.divide(new BigDecimal(1000), 4, BigDecimal.ROUND_HALF_UP);
             otherPipeLength = otherPipeLength.add(divide);
             staticCountByGroup.put("N/A", otherPipeLength);

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

@@ -22,7 +22,6 @@ import com.yeejoin.amos.boot.module.common.api.dto.DPFilterParamForDetailDto;
 import com.yeejoin.amos.boot.module.common.api.dto.FormValue;
 import com.yeejoin.amos.boot.module.common.api.dto.LegendDataDto;
 import com.yeejoin.amos.boot.module.common.api.enums.BusinessTypeEnum;
-import com.yeejoin.amos.boot.module.common.api.enums.CylinderTypeEnum;
 import com.yeejoin.amos.boot.module.common.api.enums.*;
 import com.yeejoin.amos.boot.module.jg.api.dto.EquipBizCountDto;
 import com.yeejoin.amos.boot.module.jg.api.dto.FourColorCountDataDto;
@@ -483,6 +482,7 @@ public class JGDPStatisticsServiceImpl {
         BigDecimal pipeLong;
         BoolQueryBuilder pipeLengthQuery = new BoolQueryBuilder();
         pipeLengthQuery.must(QueryBuilders.prefixQuery("ORG_BRANCH_CODE", orgCode));
+        pipeLengthQuery.must(QueryBuilders.termQuery("EQU_LIST_CODE","8000"));
         pipeLengthQuery.must(QueryBuilders.existsQuery("pipeLength"));
         pipeLengthQuery.must(existsQuery("SUPERVISORY_CODE"));
         pipeLengthQuery.mustNot(QueryBuilders.termQuery("SUPERVISORY_CODE", ""));