RuoYi-Vue-fast-master/src/main/java/com/ruoyi/project/business/service/quotation/impl/PriceCalcServiceImpl.java

@@ -287,7 +287,7 @@ public class PriceCalcServiceImpl implements IPriceCalcService {
                 JEPSplitEnum.PARAM_SPLIT_FLAG.getFuncKey()
                     + markupName
                     + JEPSplitEnum.PARAM_SPLIT_FLAG.getFuncKey(),
-                "-1");
+                BigDecimal.ZERO.toPlainString());
             paramCodeInputTypeMap.put(JEPSplitEnum.PARAM_SPLIT_FLAG.getFuncKey()
                 + markupName
                 + JEPSplitEnum.PARAM_SPLIT_FLAG.getFuncKey(), InputTypeEnum.INPUT_NUMBER.getCode());

RuoYi-Vue-fast-master/src/main/java/com/ruoyi/project/business/service/quotation/impl/TqQuotationServiceImpl.java

@@ -1142,10 +1142,18 @@ public class TqQuotationServiceImpl extends ServiceImpl<TqQuotationMapper, TqQuo
             // 1.2.3 扶手
             String handrail = data.getString(HANDRAIL_YES_NO);
             if ("Yes".equals(handrail)){
-                data.put("handrailDetail", getMaterialInfoWithCode.apply(HANDRAIL_TYPE_LEFT, HANDRAIL_TYPE_CODE_LEFT));
-                data.put("handrailDetail1", getMaterialInfoWithCode.apply(HANDRAIL_TYPE_RIGHT, HANDRAIL_TYPE_CODE_RIGHT));
-                data.put("handrailDetail2", getMaterialInfoWithCode.apply(HANDRAIL_TYPE_REAR, HANDRAIL_TYPE_CODE_REAR));
-                data.put("handrailDetail3", getMaterialInfoWithCode.apply(HANDRAIL_MATERIAL, HANDRAIL_MATERIAL_CODE));
+                if (!"No".equals(data.getString(HANDRAIL_TYPE_LEFT))){
+                    data.put("handrailDetail", getMaterialInfoWithCode.apply(HANDRAIL_TYPE_LEFT, HANDRAIL_TYPE_CODE_LEFT));
+                }
+                if (!"No".equals(data.getString(HANDRAIL_TYPE_RIGHT))){
+                    data.put("handrailDetail1", getMaterialInfoWithCode.apply(HANDRAIL_TYPE_RIGHT, HANDRAIL_TYPE_CODE_RIGHT));
+                }
+                if (!"No".equals(data.getString(HANDRAIL_TYPE_REAR))){
+                    data.put("handrailDetail2", getMaterialInfoWithCode.apply(HANDRAIL_TYPE_REAR, HANDRAIL_TYPE_CODE_REAR));
+                }
+                if (!"No".equals(data.getString(HANDRAIL_MATERIAL))){
+                    data.put("handrailDetail3", getMaterialInfoWithCode.apply(HANDRAIL_MATERIAL, HANDRAIL_MATERIAL_CODE));
+                }
             }
 
             // 1.2.4 吊顶