Commit 5befd66f authored by suhuiguang's avatar suhuiguang

1.区县未在amos创建公司时代码报错处理

parent 5aacb2d7
...@@ -103,7 +103,7 @@ public class CylinderDPStatisticsServiceImpl { ...@@ -103,7 +103,7 @@ public class CylinderDPStatisticsServiceImpl {
// 这里只是打印出聚合的名称和桶的数量,你需要根据自己的需求来处理这些数据 // 这里只是打印出聚合的名称和桶的数量,你需要根据自己的需求来处理这些数据
Terms terms = searchResponse.getAggregations().get("USE_UNIT_CREDIT_CODE"); Terms terms = searchResponse.getAggregations().get("USE_UNIT_CREDIT_CODE");
List<Map<String, Object>> dataList = new ArrayList<>(); List<Map<String, Object>> dataList = new ArrayList<>();
List<String> keys = new ArrayList<>(); Set<String> keys = new HashSet<>();
for (Terms.Bucket bucket : terms.getBuckets()) { for (Terms.Bucket bucket : terms.getBuckets()) {
Map<String, Object> item = new HashMap<>(); Map<String, Object> item = new HashMap<>();
item.put("count", bucket.getDocCount()); item.put("count", bucket.getDocCount());
...@@ -111,7 +111,10 @@ public class CylinderDPStatisticsServiceImpl { ...@@ -111,7 +111,10 @@ public class CylinderDPStatisticsServiceImpl {
dataList.add(item); dataList.add(item);
keys.add(bucket.getKeyAsString()); keys.add(bucket.getKeyAsString());
} }
Map<String, TzBaseEnterpriseInfo> useCodeEntryMap = getStringTzBaseEnterpriseInfoDtoMap(keys); Map<String, TzBaseEnterpriseInfo> useCodeEntryMap = new HashMap<>();
if(keys.size() > 0){
useCodeEntryMap = getStringTzBaseEnterpriseInfoDtoMap(keys);
}
for (Map<String, Object> item : dataList) { for (Map<String, Object> item : dataList) {
Object key = item.get("key"); Object key = item.get("key");
if (useCodeEntryMap.containsKey(key)) { if (useCodeEntryMap.containsKey(key)) {
...@@ -124,7 +127,7 @@ public class CylinderDPStatisticsServiceImpl { ...@@ -124,7 +127,7 @@ public class CylinderDPStatisticsServiceImpl {
return dataList; return dataList;
} }
private Map<String, TzBaseEnterpriseInfo> getStringTzBaseEnterpriseInfoDtoMap(List<String> keys) { private Map<String, TzBaseEnterpriseInfo> getStringTzBaseEnterpriseInfoDtoMap(Set<String> keys) {
LambdaQueryWrapper<TzBaseEnterpriseInfo> queryWrapper = new LambdaQueryWrapper<>(); LambdaQueryWrapper<TzBaseEnterpriseInfo> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.in(TzBaseEnterpriseInfo::getUseUnitCode, keys); queryWrapper.in(TzBaseEnterpriseInfo::getUseUnitCode, keys);
queryWrapper.select(TzBaseEnterpriseInfo::getUseUnitCode, TzBaseEnterpriseInfo::getProvince, TzBaseEnterpriseInfo::getCity, TzBaseEnterpriseInfo::getDistrict, TzBaseEnterpriseInfo::getUseUnit); queryWrapper.select(TzBaseEnterpriseInfo::getUseUnitCode, TzBaseEnterpriseInfo::getProvince, TzBaseEnterpriseInfo::getCity, TzBaseEnterpriseInfo::getDistrict, TzBaseEnterpriseInfo::getUseUnit);
......
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