|
|
@@ -246,10 +246,6 @@ public class DataCountService {
|
|
|
for (IndustrialPark industrialPark : allPark) {
|
|
|
String parkCode = industrialPark.getCParkCode();
|
|
|
|
|
|
- for (EnterpriseLevel value : EnterpriseLevel.values()) {
|
|
|
- enterPriceLevelCountByPark.get(value).put(industrialPark.getCResourceName(), 0);
|
|
|
- }
|
|
|
-
|
|
|
List<IndustrialPark> allBuild;
|
|
|
List<IndustrialPark> allRoom = new ArrayList<>();
|
|
|
|
|
|
@@ -340,13 +336,16 @@ public class DataCountService {
|
|
|
tempCacheBuildData.put(buildCode, buildData);
|
|
|
}
|
|
|
|
|
|
+ for (EnterpriseLevel value : EnterpriseLevel.values()) {
|
|
|
+ enterPriceLevelCountByPark.get(value).put(industrialPark.getCResourceName(), 0);
|
|
|
+ }
|
|
|
for (String enterpriseCode : inParkEnterpriseCode) {
|
|
|
if (aliveEnterpriseMap.containsKey(enterpriseCode)) {
|
|
|
Enterprise enterprise = aliveEnterpriseMap.get(enterpriseCode);
|
|
|
|
|
|
EnterpriseLevel.ofJsonValue(enterprise.getCompanyLevel()).ifPresent(level -> {
|
|
|
Map<String, Integer> map = enterPriceLevelCountByPark.get(level);
|
|
|
- map.put(enterpriseCode, map.get(enterprise.getCEnterpriseName()) + 1);
|
|
|
+ map.put(industrialPark.getCResourceName(), map.get(industrialPark.getCResourceName()) + 1);
|
|
|
});
|
|
|
|
|
|
EnterpriseEconomicCount ytdThisYear = economicCountByYtdThisYear.get(enterpriseCode);
|