修改方案过滤的bug

tenant/organization/src/main/java/com/jzg/organization/service/impl/PtlSchemeServiceImpl.java

@@ -541,6 +541,14 @@ public class PtlSchemeServiceImpl extends ServiceImpl<PtlSchemeMapper, PtlScheme
         List<SchemeResultVo.SchemeVo> schemeInsuranceInfo = ptlSchemeMapper.getSchemeInsuranceInfo(companyId, productId);
         List<SchemeResultVo.SchemeVo> schemeDrivingInfo = ptlSchemeMapper.getSchemeDrivingInfo(companyId, productId);
 
+        // 过滤类型
+        List<SchemeResultVo.SchemeVo> newSchemeList = schemeInsuranceInfo.stream()
+                .filter(scheme -> scheme.getVehicleType().contains(vehicleType)
+                        && scheme.getEnergyType().contains(energyType)
+                        && scheme.getCarnature().contains(carnature))
+                .collect(Collectors.toList());
+
+        schemeInsuranceInfo = newSchemeList;
 
         // 创建一个 Map，Key: info.id, Value: List<Driving>
         Map<String, List<SchemeResultVo.Driving>> drivingMap = new HashMap<>();
@@ -636,24 +644,6 @@ public class PtlSchemeServiceImpl extends ServiceImpl<PtlSchemeMapper, PtlScheme
         if (optionalScheme != null && optionalScheme.getKinds() != null) {
             optionalScheme.getKinds().removeIf(kind -> "J1".equals(kind.getKindCode()));
         }
-
-        //过滤 能源类型 使用性质 车辆种类
-        List<PtlScheme> ptlSchemes = ptlSchemeMapper.selectList(new LambdaQueryWrapper<PtlScheme>().
-                eq(PtlScheme::getCompanyId, companyId).eq(PtlScheme::getEnergyType, energyType).
-                eq(PtlScheme::getCarnature, carnature).eq(PtlScheme::getVehicleType, vehicleType).
-                eq(PtlScheme::getProductId, productId).eq(PtlScheme::getIsDelete, 0));
-        Map<String, PtlScheme> collectPtlSchemes = ptlSchemes.stream().collect(Collectors.toMap(PtlScheme::getId, Function.identity()));
-        AssertionUtils.isFail(collectPtlSchemes.isEmpty(), "没有可报价的方案配置信息");
-        List<String> schemeInfoIds = new ArrayList<>();
-        for (SchemeResultVo.SchemeInfoVo schemeInfo : schemeResultVo.getSchemes()) {
-            schemeInfoIds.add(schemeInfo.getId());
-        }
-        List<PtlSchemeInfo> ptlSchemeInfos = ptlSchemeInfoMapper.selectList(new LambdaQueryWrapper<PtlSchemeInfo>().in(PtlSchemeInfo::getId, schemeInfoIds));
-        List<String> schemeIds = new ArrayList<>();
-        for (PtlSchemeInfo ptlSchemeInfo : ptlSchemeInfos) {
-            schemeIds.add(ptlSchemeInfo.getSchemeId());
-        }
-        schemeResultVo.getSchemes().removeIf(s -> !schemeIds.contains(s.getId()));
         return schemeResultVo;
     }