*）修改电梯统计接口

amos-boot-system-tzs/amos-boot-module-96333/amos-boot-module-96333-biz/src/main/java/com/yeejoin/amos/boot/module/elevator/biz/service/impl/DPStatisticsServiceImpl.java

@@ -111,20 +111,20 @@ public class DPStatisticsServiceImpl {
     }
 
     public JSONObject elevatorCountStat(DPFilterParamDto dpFilterParamDto) throws Exception {
-        String regionCode = dpFilterParamDto.getCityCode();
         List<RegionModel> regionList = this.getRegionList(dpFilterParamDto);
         List<String> xdata = regionList.stream().map(r -> r.getRegionName().toString()).collect(Collectors.toList());
-        if (!regionCode.equals("610000")){
-            regionCode = "610000#" +  regionCode;
-        }
+
         List<Integer> ydata = new ArrayList<>();
-        String finalRegionCode = regionCode;
-        regionList.stream().forEach(x -> {
+        Map<String, Integer> map =  new HashMap<>();
+
+        regionList.parallelStream().forEach(x -> {
             LambdaQueryWrapper<Elevator> lambda = new QueryWrapper<Elevator>().lambda();
-            lambda.eq(Elevator::getRegionCode, finalRegionCode + "#" + x.getRegionCode());
-            ydata.add(elevatorMapper.selectCount(lambda));
+            lambda.like(Elevator::getRegionCode, x.getRegionCode());
+            map.put(x.getRegionName(), elevatorMapper.selectCount(lambda));
+        });
+        xdata.stream().forEach(x -> {
+            ydata.add(map.get(x));
         });
-
         JSONObject jsonObject = new JSONObject();
         jsonObject.put("xdata", xdata);
         jsonObject.put("ydata", ydata);