From 7fa54e4adb3c388595fc769345f5a2391eae2dd4 Mon Sep 17 00:00:00 2001
From: qianbao <qianbaoqianbao>
Date: Mon, 27 Jul 2026 22:36:37 +0800
Subject: [PATCH] 添加未清选择 改成动态引导语

---
 src/main/java/com/xly/service/QuoService.java | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

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<ParamRule> dataAll = dataAllData.stream().filter(one->one.getBTipModel()).collect(Collectors.toList());
             //获取产品的参数
-            List<ParamRule> dataProduct = dataAll.stream().filter(one-> "产品".equals(one.getSGroup()) && !one.getBDynamicParam()).collect(Collectors.toUnmodifiableList());
-            List<ParamRule> dataPart = dataAll.stream().filter(one-> "部件".equals(one.getSGroup()) && !one.getBDynamicParam()).collect(Collectors.toUnmodifiableList());
+            List<ParamRule> dataProductAll = dataAll.stream().filter(one-> "产品".equals(one.getSGroup()) && !one.getBDynamicParam()).collect(Collectors.toUnmodifiableList());
+            List<ParamRule> dataProduct = dataProductAll.stream().filter(one->
+                    !"sDynamicPart".equals(one.getSParamValue())
+                            && !"sDynamicPartDel".equals(one.getSParamValue())
+            ).collect(Collectors.toList());
+            List<ParamRule> dataPartAll = dataAll.stream().filter(one-> "部件".equals(one.getSGroup()) && !one.getBDynamicParam()).collect(Collectors.toUnmodifiableList());
+            List<ParamRule> dataPart = dataPartAll.stream().filter(one->
+                    !"sDynamicPart".equals(one.getSParamValue())
+                            && !"sDynamicPartDel".equals(one.getSParamValue())
+            ).collect(Collectors.toList());
             List<ParamRule> datasDynamicPart = dataAll.stream().filter(one-> "sDynamicPart".equals(one.getSParamValue()) && !one.getBDynamicParam()).collect(Collectors.toUnmodifiableList());
+
             List<Map<String,Object>> sAll = new ArrayList<>();
             List<Map<String,Object>> productList = new ArrayList<>();
             Map<String, Object> 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<Map<String,Object>> partList = new ArrayList<>();
--
libgit2 0.22.2