fix(大屏):获取本级及子级区域code，将单位code转行政区划

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

@@ -56,6 +56,7 @@ import java.util.concurrent.ConcurrentHashMap;
 import java.util.function.Function;
 import java.util.function.Predicate;
 import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 import static org.elasticsearch.index.query.QueryBuilders.existsQuery;
 
@@ -565,7 +566,11 @@ public class StCommonServiceImpl {
      * @return 本级及子级区域code
      */
     public String getSelfAndChildRegion(RegionModel region) {
-        return null;
+        return Stream.concat(Stream.of(region.getRegionCode()), region.getChildren() == null ? Stream.empty() :
+                        region.getChildren().stream().flatMap(child ->
+                                Arrays.stream(getSelfAndChildRegion(child).split(",")).map(Integer::parseInt)))
+                .map(String::valueOf)
+                .collect(Collectors.joining(","));
     }
 
     /**
@@ -575,8 +580,10 @@ public class StCommonServiceImpl {
      */
     public CharSequence castCompanyCode2RegionCode(String companyCode) {
         String regionSeq = commonMapper.selectCompanyRegionSeq(companyCode);
-        Optional<RegionModel> optionalRegionModel = regionModels.stream().filter(r-> String.valueOf(r.getSequenceNbr()).equals(regionSeq)).findFirst();
-        optionalRegionModel.orElseThrow(()->new RuntimeException(""));
-        return null;
+        RegionModel region = regionModels.stream()
+                .filter(r -> String.valueOf(r.getSequenceNbr()).equals(regionSeq))
+                .findFirst()
+                .orElseThrow(() -> new RuntimeException("未找到对应区域"));
+        return String.valueOf(region.getRegionCode());
     }
 }