diff --git a/aircraft-system/src/main/java/com/aircraft/modules/order/service/impl/OrderDetailAnalysisServiceImpl.java b/aircraft-system/src/main/java/com/aircraft/modules/order/service/impl/OrderDetailAnalysisServiceImpl.java index a59973e..c480586 100644 --- a/aircraft-system/src/main/java/com/aircraft/modules/order/service/impl/OrderDetailAnalysisServiceImpl.java +++ b/aircraft-system/src/main/java/com/aircraft/modules/order/service/impl/OrderDetailAnalysisServiceImpl.java @@ -10,6 +10,7 @@ import com.aircraft.modules.order.service.IOrderDetailService; import com.aircraft.modules.order.service.OrderDetailAnalysisService; import com.aircraft.modules.route.domain.CpRoute; import com.aircraft.modules.route.mapper.CpRouteMapper; +import com.aircraft.modules.system.domain.EmScenic; import com.aircraft.modules.system.mapper.EmScenicMapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -523,8 +524,12 @@ public class OrderDetailAnalysisServiceImpl implements OrderDetailAnalysisServic .collect(Collectors.toSet()); // 批量查询景区名称 - Map scenicNameMap = emScenicMapper.getScenicNameMap(new ArrayList<>(scenicIds)); - + Map scenicNameMap = new HashMap<>(); + if (!scenicIds.isEmpty()) { + List scenics = emScenicMapper.listByIds(new ArrayList<>(scenicIds)); + scenicNameMap = scenics.stream() + .collect(Collectors.toMap(EmScenic::getId, EmScenic::getName, (existing, replacement) -> existing)); + } // 4. 组装结果 for (Map.Entry entry : routeCountMap.entrySet()) { Long routeId = entry.getKey(); @@ -553,7 +558,6 @@ public class OrderDetailAnalysisServiceImpl implements OrderDetailAnalysisServic result.add(stat); } } - return result; } diff --git a/aircraft-system/src/main/java/com/aircraft/modules/system/mapper/EmScenicMapper.java b/aircraft-system/src/main/java/com/aircraft/modules/system/mapper/EmScenicMapper.java index 84c3f22..3a466aa 100644 --- a/aircraft-system/src/main/java/com/aircraft/modules/system/mapper/EmScenicMapper.java +++ b/aircraft-system/src/main/java/com/aircraft/modules/system/mapper/EmScenicMapper.java @@ -36,4 +36,6 @@ public interface EmScenicMapper extends BaseMapper { List countByAreaId(); Map getScenicNameMap(ArrayList scenicIds); + + List listByIds(ArrayList ids); } diff --git a/aircraft-system/src/main/resources/mapper/EmAreaMapper.xml b/aircraft-system/src/main/resources/mapper/EmAreaMapper.xml index 3bc837c..9c3a181 100644 --- a/aircraft-system/src/main/resources/mapper/EmAreaMapper.xml +++ b/aircraft-system/src/main/resources/mapper/EmAreaMapper.xml @@ -1,6 +1,19 @@ + + + + + + + + + + + + + + +