楼宇级别企业行业统计聚合到门类

src/main/java/com/skyversation/xjcy/service/DataCountService.java

@@ -397,12 +397,12 @@ public class DataCountService {
             Map<String, Integer> enterPriceIndustryCount = new HashMap<>();
             for (String enterpriseCode : inParkEnterpriseCode) {
                 boolean isGsqy = false;
-                String nationalIndustry = null;
+                String nationalIndustryCode = null;
                 if (aliveEnterpriseMap.containsKey(enterpriseCode)) {
                     Enterprise enterprise = aliveEnterpriseMap.get(enterpriseCode);
 
                     isGsqy = "2".equals(enterprise.getIsGsqy());
-                    nationalIndustry = enterprise.getCNationalIndustry();
+                    nationalIndustryCode = enterprise.getCNationalIndustryCode();
 
                     EnterpriseLevel.ofJsonValue(enterprise.getCompanyLevel()).ifPresent(level -> {
                         Map<String, Integer> map = enterPriceLevelCountByPark.get(level);
@@ -431,7 +431,10 @@ public class DataCountService {
                 if (isGsqy) {
                     enterPriceGsCount++;
                 }
-                if (nationalIndustry != null) {
+                if (nationalIndustryCode != null) {
+                    String prefix = nationalIndustryCode.substring(0, 1);
+                    String nationalIndustry = nationalIndustryMap.get(prefix);
+
                     if (enterPriceIndustryCount.containsKey(nationalIndustry)) {
                         enterPriceIndustryCount.put(nationalIndustry, enterPriceIndustryCount.get(nationalIndustry) + 1);
                     } else {