Merge branch 'local_20221104' into huacheng_test

yanghui

2022-12-05 e6430287b40bbe8e8c6821219b96896b57f6b6d8

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ConvenientElevatingPointServiceImpl.java

@@ -147,10 +147,10 @@
        String maxLng = around.get("maxLng").toString();
        List<ConvenientElevatingPointDO> convenientElevatingPointDOS = this.baseMapper.selectList(
                new LambdaQueryWrapper<ConvenientElevatingPointDO>()
                        .ge(ConvenientElevatingPointDO::getLat, minLng)
                        .le(ConvenientElevatingPointDO::getLat, maxLng)
                        .ge(ConvenientElevatingPointDO::getLon, minLat)
                        .le(ConvenientElevatingPointDO::getLon, maxLat)
                        .ge(ConvenientElevatingPointDO::getLat, Double.parseDouble(minLng))
                        .le(ConvenientElevatingPointDO::getLat, Double.parseDouble(maxLng))
                        .ge(ConvenientElevatingPointDO::getLon, Double.parseDouble(minLat))
                        .le(ConvenientElevatingPointDO::getLon, Double.parseDouble(maxLat))
                        .eq(ConvenientElevatingPointDO::getBusinessStatus,1));
        List<ConvenientElevatingPointVO> convenientElevatingPointVOS = new ArrayList<>();
        convenientElevatingPointDOS.forEach(f -> {
@@ -174,10 +174,10 @@
        String maxLng = around.get("maxLng").toString();
        List<ConvenientElevatingPointDO> convenientElevatingPointDOS = this.baseMapper.selectList(
                new LambdaQueryWrapper<ConvenientElevatingPointDO>()
                        .ge(ConvenientElevatingPointDO::getLat, minLng)
                        .le(ConvenientElevatingPointDO::getLat, maxLng)
                        .ge(ConvenientElevatingPointDO::getLon, minLat)
                        .le(ConvenientElevatingPointDO::getLon, maxLat)
                        .ge(ConvenientElevatingPointDO::getLat, Double.parseDouble(minLng))
                        .le(ConvenientElevatingPointDO::getLat, Double.parseDouble(maxLng))
                        .ge(ConvenientElevatingPointDO::getLon, Double.parseDouble(minLat))
                        .le(ConvenientElevatingPointDO::getLon, Double.parseDouble(maxLat))
                        .eq(ConvenientElevatingPointDO::getBusinessStatus,1));
        List<ConvenientElevatingPointVO> convenientElevatingPointVOS = new ArrayList<>();
        convenientElevatingPointDOS.forEach(f -> {