diff --git a/src/main/java/com/xly/service/QuoService.java b/src/main/java/com/xly/service/QuoService.java index e013e97..1ba0044 100644 --- a/src/main/java/com/xly/service/QuoService.java +++ b/src/main/java/com/xly/service/QuoService.java @@ -42,9 +42,18 @@ public class QuoService { List dataAll = dataAllData.stream().filter(one->one.getBTipModel()).collect(Collectors.toList()); //获取产品的参数 - List dataProduct = dataAll.stream().filter(one-> "产品".equals(one.getSGroup()) && !one.getBDynamicParam()).collect(Collectors.toUnmodifiableList()); - List dataPart = dataAll.stream().filter(one-> "部件".equals(one.getSGroup()) && !one.getBDynamicParam()).collect(Collectors.toUnmodifiableList()); + List dataProductAll = dataAll.stream().filter(one-> "产品".equals(one.getSGroup()) && !one.getBDynamicParam()).collect(Collectors.toUnmodifiableList()); + List dataProduct = dataProductAll.stream().filter(one-> + !"sDynamicPart".equals(one.getSParamValue()) + && !"sDynamicPartDel".equals(one.getSParamValue()) + ).collect(Collectors.toList()); + List dataPartAll = dataAll.stream().filter(one-> "部件".equals(one.getSGroup()) && !one.getBDynamicParam()).collect(Collectors.toUnmodifiableList()); + List dataPart = dataPartAll.stream().filter(one-> + !"sDynamicPart".equals(one.getSParamValue()) + && !"sDynamicPartDel".equals(one.getSParamValue()) + ).collect(Collectors.toList()); List datasDynamicPart = dataAll.stream().filter(one-> "sDynamicPart".equals(one.getSParamValue()) && !one.getBDynamicParam()).collect(Collectors.toUnmodifiableList()); + List> sAll = new ArrayList<>(); List> productList = new ArrayList<>(); Map finalArgsOld = args; @@ -69,11 +78,7 @@ public class QuoService { product.put("sParamConfigValue",p.getSParamConfigValue()==null?StrUtil.EMPTY:p.getSParamConfigValue()); //获取动态参数 adddynamicData( sValue, finalDataAll, p, finalArgsOld, sAll, product); - if( !"sDynamicPart".equals(p.getSParamValue()) - &&!"sDynamicPartDel".equals(p.getSParamValue()) - ){ - productList.add(product); - } + productList.add(product); } }); List> partList = new ArrayList<>();