Administrator / xlyAi

Commit 7fa54e4adb3c388595fc769345f5a2391eae2dd4

Authored by qianbao
1 parent b90357f3

添加未清选择 改成动态引导语

Inline Side-by-side
Showing 1 changed file with 12 additions and 7 deletions
src/main/java/com/xly/service/QuoService.java
  View file @7fa54e4
@@ -42,9 +42,18 @@ public class QuoService { @@ -42,9 +42,18 @@ public class QuoService {
42 42
43 List<ParamRule> dataAll = dataAllData.stream().filter(one->one.getBTipModel()).collect(Collectors.toList()); 43 List<ParamRule> dataAll = dataAllData.stream().filter(one->one.getBTipModel()).collect(Collectors.toList());
44 //获取产品的参数 44 //获取产品的参数
45 - List<ParamRule> dataProduct = dataAll.stream().filter(one-> "产品".equals(one.getSGroup()) && !one.getBDynamicParam()).collect(Collectors.toUnmodifiableList());  
46 - List<ParamRule> dataPart = dataAll.stream().filter(one-> "部件".equals(one.getSGroup()) && !one.getBDynamicParam()).collect(Collectors.toUnmodifiableList()); 45 + List<ParamRule> dataProductAll = dataAll.stream().filter(one-> "产品".equals(one.getSGroup()) && !one.getBDynamicParam()).collect(Collectors.toUnmodifiableList());
  46 + List<ParamRule> dataProduct = dataProductAll.stream().filter(one->
  47 + !"sDynamicPart".equals(one.getSParamValue())
  48 + && !"sDynamicPartDel".equals(one.getSParamValue())
  49 + ).collect(Collectors.toList());
  50 + List<ParamRule> dataPartAll = dataAll.stream().filter(one-> "部件".equals(one.getSGroup()) && !one.getBDynamicParam()).collect(Collectors.toUnmodifiableList());
  51 + List<ParamRule> dataPart = dataPartAll.stream().filter(one->
  52 + !"sDynamicPart".equals(one.getSParamValue())
  53 + && !"sDynamicPartDel".equals(one.getSParamValue())
  54 + ).collect(Collectors.toList());
47 List<ParamRule> datasDynamicPart = dataAll.stream().filter(one-> "sDynamicPart".equals(one.getSParamValue()) && !one.getBDynamicParam()).collect(Collectors.toUnmodifiableList()); 55 List<ParamRule> datasDynamicPart = dataAll.stream().filter(one-> "sDynamicPart".equals(one.getSParamValue()) && !one.getBDynamicParam()).collect(Collectors.toUnmodifiableList());
  56 +
48 List<Map<String,Object>> sAll = new ArrayList<>(); 57 List<Map<String,Object>> sAll = new ArrayList<>();
49 List<Map<String,Object>> productList = new ArrayList<>(); 58 List<Map<String,Object>> productList = new ArrayList<>();
50 Map<String, Object> finalArgsOld = args; 59 Map<String, Object> finalArgsOld = args;
@@ -69,11 +78,7 @@ public class QuoService { @@ -69,11 +78,7 @@ public class QuoService {
69 product.put("sParamConfigValue",p.getSParamConfigValue()==null?StrUtil.EMPTY:p.getSParamConfigValue()); 78 product.put("sParamConfigValue",p.getSParamConfigValue()==null?StrUtil.EMPTY:p.getSParamConfigValue());
70 //获取动态参数 79 //获取动态参数
71 adddynamicData( sValue, finalDataAll, p, finalArgsOld, sAll, product); 80 adddynamicData( sValue, finalDataAll, p, finalArgsOld, sAll, product);
72 - if( !"sDynamicPart".equals(p.getSParamValue())  
73 - &&!"sDynamicPartDel".equals(p.getSParamValue())  
74 - ){  
75 - productList.add(product);  
76 - } 81 + productList.add(product);
77 } 82 }
78 }); 83 });
79 List<Map<String,Object>> partList = new ArrayList<>(); 84 List<Map<String,Object>> partList = new ArrayList<>();