From 3f85ce37485798bd9bf1cd29f0f6cbcb64a96500 Mon Sep 17 00:00:00 2001
From: qiezi <15576055375@163.com>
Date: Fri, 6 Dec 2024 17:30:29 +0800
Subject: [PATCH] 2024-12-06

---
 .../service/impl/QuoteDetailServiceImpl.java  | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/spring/modules/quote/service/impl/QuoteDetailServiceImpl.java b/src/main/java/com/spring/modules/quote/service/impl/QuoteDetailServiceImpl.java
index 043bae74..d441d161 100644
--- a/src/main/java/com/spring/modules/quote/service/impl/QuoteDetailServiceImpl.java
+++ b/src/main/java/com/spring/modules/quote/service/impl/QuoteDetailServiceImpl.java
@@ -215,7 +215,22 @@ public class QuoteDetailServiceImpl extends ServiceImpl<QuoteDetailMapper, Quote
                 actualQuotePrice = actualQuotePrice.add(detailBom.getActualQuotePrice());
             }
         }
-
+        // 测试
+        BigDecimal testCost = BigDecimal.ZERO;
+        List<QuoteDetailTest> testList = quoteDetailTestService.lambdaQuery()
+                .eq(QuoteDetailTest::getQuoteDetailId, quoteDetail.getId())
+                .list();
+        for (QuoteDetailTest detailTest : testList) {
+            testCost = testCost.add(detailTest.getQuoteTestCost());
+        }
+        // 其他
+        BigDecimal elseCost = BigDecimal.ZERO;
+        List<QuoteDetailOther> otherList = quoteDetailOtherService.lambdaQuery()
+                .eq(QuoteDetailOther::getQuoteDetailId, quoteDetail.getId())
+                .list();
+        for (QuoteDetailOther detailOther : otherList) {
+            elseCost = elseCost.add(detailOther.getQuoteOtherCost());
+        }
 
         // 传入map
         map.put("toolCost", toolCost);
@@ -228,6 +243,8 @@ public class QuoteDetailServiceImpl extends ServiceImpl<QuoteDetailMapper, Quote
         map.put("labourCost", labourCost);
         map.put("machineCost", machineCost);
         map.put("manufactureCost", manufactureCost);
+        map.put("testCost", testCost);
+        map.put("elseCost", elseCost);
         return map;
     }