问题处理

hx-admin/src/main/resources/application-prod.yml

@@ -2,7 +2,7 @@
 spring:
     datasource:
         dynamic:
-          strict: true
+            strict: true
             primary: base
             datasource:
               base:

hx-sale/src/main/java/com/fjhx/sale/entity/quotation/po/QuotationProduct.java

@@ -152,4 +152,9 @@ public class QuotationProduct extends BasePo {
      */
     private BigDecimal discussPrice;
 
+    /**
+     * 业务成本价
+     */
+    private BigDecimal businessCostPrice;
+
 }

hx-sale/src/main/java/com/fjhx/sale/entity/sale/po/SaleQuotation.java

@@ -137,4 +137,9 @@ public class SaleQuotation extends BasePo {
      * 议价备注
      */
     private String discussRemark;
+
+    /**
+     * 业务成本总金额
+     */
+    private BigDecimal businessCostAmount;
 }

hx-sale/src/main/java/com/fjhx/sale/service/ext/impl/ExtQuotationServiceImpl.java

@@ -145,6 +145,12 @@ public class ExtQuotationServiceImpl extends ServiceImpl<ExtQuotationMapper, Ext
         List<Long> ids = records.stream().map(ExtQuotationVo::getId).collect(Collectors.toList());
         List<ExtQuotationProduct> pList = extQuotationProductService.list(q -> q.in(ExtQuotationProduct::getSaleQuotationId, ids));
         List<ExtQuotationProductVo> quotationProductVos = BeanUtil.copyToList(pList, ExtQuotationProductVo.class);
+        for (ExtQuotationProductVo quotationProductVo : quotationProductVos) {
+            //定制产品名称先显示待定
+            if (ObjectUtil.isEmpty(quotationProductVo.getProductId())) {
+                quotationProductVo.setProductName("待定");
+            }
+        }
         //赋值产品信息
         productInfoService.attributeAssign(quotationProductVos, ExtQuotationProductVo::getProductId, (item, productInfo) -> {
             item.setProductCode(productInfo.getCustomCode());