From 2b25f799246e5a43540ca51073fc8a70bf6a0e1b Mon Sep 17 00:00:00 2001
From: qiezi <15576055375@163.com>
Date: Tue, 7 Jan 2025 14:15:28 +0800
Subject: [PATCH] 2025-1-7

---
 .../com/spring/modules/quote/service/QuoteDetailService.java  | 2 +-
 .../modules/quote/service/impl/QuoteDetailServiceImpl.java    | 4 ++--
 .../quote/service/impl/QuoteGroupDetailServiceImpl.java       | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/spring/modules/quote/service/QuoteDetailService.java b/src/main/java/com/spring/modules/quote/service/QuoteDetailService.java
index a75038e2..e4890684 100644
--- a/src/main/java/com/spring/modules/quote/service/QuoteDetailService.java
+++ b/src/main/java/com/spring/modules/quote/service/QuoteDetailService.java
@@ -25,7 +25,7 @@ public interface QuoteDetailService extends IService<QuoteDetail> {
 
     Map<String, Object> queryQuoteDetailCost(QuoteDetail quoteDetail);
 
-    void againQuoteDetail(Quote againQuote,Long id,Long quoteGroupDetailId);
+    void againQuoteDetail(Quote againQuote,Long id,Long preGroupId,Long quoteGroupDetailId);
 
     void againQuoteDetail(QuoteDetail quoteDetail);
 
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 ecebe009..f20a876b 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
@@ -427,8 +427,8 @@ public class QuoteDetailServiceImpl extends ServiceImpl<QuoteDetailMapper, Quote
 
 
     @Override
-    public void againQuoteDetail(Quote againQuote, Long id,Long groupId) {
-        List<QuoteDetail> list = lambdaQuery().eq(QuoteDetail::getQuoteId, id).list();
+    public void againQuoteDetail(Quote againQuote, Long id,Long preGroupId,Long groupId) {
+        List<QuoteDetail> list = lambdaQuery().eq(QuoteDetail::getQuoteId,id).eq(QuoteDetail::getQuoteGroupDetailId, preGroupId).list();
         for (QuoteDetail quoteDetail : list) {
             quoteDetail.setQuoteId(againQuote.getId());
             quoteDetail.setQuoteNo(againQuote.getQuoteNo());
diff --git a/src/main/java/com/spring/modules/quote/service/impl/QuoteGroupDetailServiceImpl.java b/src/main/java/com/spring/modules/quote/service/impl/QuoteGroupDetailServiceImpl.java
index ea8b70c7..95af9e8e 100644
--- a/src/main/java/com/spring/modules/quote/service/impl/QuoteGroupDetailServiceImpl.java
+++ b/src/main/java/com/spring/modules/quote/service/impl/QuoteGroupDetailServiceImpl.java
@@ -89,7 +89,7 @@ public class QuoteGroupDetailServiceImpl extends ServiceImpl<QuoteGroupDetailMap
             quoteGroupDetail.setQuoteNo(againQuote.getQuoteNo());
             quoteGroupDetail.setVersionNo(againQuote.getVersionNo());
 
-//            Long groupDetailId = quoteGroupDetail.getId();
+            Long groupDetailId = quoteGroupDetail.getId();
             quoteGroupDetail.setId(null);
             quoteGroupDetail.setCreateBy(againQuote.getCreateBy());
             quoteGroupDetail.setCreateDate(againQuote.getCreateDate());
@@ -99,7 +99,7 @@ public class QuoteGroupDetailServiceImpl extends ServiceImpl<QuoteGroupDetailMap
             save(quoteGroupDetail);
 
 
-            quoteDetailService.againQuoteDetail(againQuote,id,quoteGroupDetail.getId());
+            quoteDetailService.againQuoteDetail(againQuote,id,groupDetailId,quoteGroupDetail.getId());
 
         }
     }