From 83b7b32035470d6a36bc3c7628866a9af133f1f8 Mon Sep 17 00:00:00 2001
From: dfdg <2710245601@qq.com>
Date: Sat, 18 Oct 2025 18:56:03 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=86=B2=E7=AA=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...urchaseContractInformationServiceImpl.java | 36 ++++++++++---------
 1 file changed, 20 insertions(+), 16 deletions(-)

diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/purchaseManagement/service/impl/XzdPurchaseContractInformationServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/purchaseManagement/service/impl/XzdPurchaseContractInformationServiceImpl.java
index 57779faa..4c3f9fdd 100644
--- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/purchaseManagement/service/impl/XzdPurchaseContractInformationServiceImpl.java
+++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/purchaseManagement/service/impl/XzdPurchaseContractInformationServiceImpl.java
@@ -150,10 +150,6 @@ public class XzdPurchaseContractInformationServiceImpl extends ServiceImpl<XzdPu
         lqw.le(bo.getEndDate() != null, XzdPurchaseContractInformation::getDocumentDate, bo.getEndDate());
 
 
-            List<XzdHtglHtbgqd> list4 = xzdHtglHtbgqdService.getBaseMapper().selectList(new LambdaQueryWrapper<XzdHtglHtbgqd>().eq(XzdHtglHtbgqd::getMainDocumentId, item.getId()));
-            item.setHtbgqds(list4);
-            List<XzdHtglHthzsj> xzdHtglHthzsjs = xzdHtglHthzsjService.getBaseMapper().selectList(new LambdaQueryWrapper<XzdHtglHthzsj>().eq(XzdHtglHthzsj::getMainDocumentId, item.getId()));
-            item.setHtghthzsjs(xzdHtglHthzsjs);
 
         lqw.eq(StringUtils.isNotBlank(bo.getContractType()), XzdPurchaseContractInformation::getContractType, bo.getContractType());
         lqw.eq(bo.getProject() != null, XzdPurchaseContractInformation::getProject, bo.getProject());
@@ -321,6 +317,20 @@ public class XzdPurchaseContractInformationServiceImpl extends ServiceImpl<XzdPu
         xzdSettlementRulesService.saveOrUpdateBatch(bo.getZftk());
         bo.getHtzytkyd().setTableName(XzdClassEnum.PURCHASE_CONTRACT_INFORMATION.getClassName());
         xzdContractDepositInfoService.saveOrUpdate(bo.getHtzytkyd());
+
+        //合同变更清单
+        xzdHtglHtbgqdService.remove(new LambdaQueryWrapper<XzdHtglHtbgqd>().eq(XzdHtglHtbgqd::getMainDocumentId,bo.getId()));
+        if (bo.getHtbgqds() != null && !bo.getHtbgqds().isEmpty()) {
+            bo.getHtbgqds().forEach(item->{item.setMainDocumentId(bo.getId());});
+            xzdHtglHtbgqdService.saveBatch(bo.getHtbgqds());
+        }
+        //汇总数据
+        xzdHtglHthzsjService.remove(new LambdaQueryWrapper<XzdHtglHthzsj>().eq(XzdHtglHthzsj::getMainDocumentId,bo.getId()));
+        if (bo.getHtghthzsjs() != null && !bo.getHtghthzsjs().isEmpty()) {
+            bo.getHtghthzsjs().forEach(item->{item.setMainDocumentId(bo.getId());});
+            xzdHtglHthzsjService.saveBatch(bo.getHtghthzsjs());
+        }
+
         return baseMapper.updateById(update) > 0;
     }
 
@@ -389,18 +399,6 @@ public class XzdPurchaseContractInformationServiceImpl extends ServiceImpl<XzdPu
 
         for (XzdPurchaseContractInformationVo item : infos) {
 
-        //合同变更清单
-        xzdHtglHtbgqdService.remove(new LambdaQueryWrapper<XzdHtglHtbgqd>().eq(XzdHtglHtbgqd::getMainDocumentId,bo.getId()));
-        if (bo.getHtbgqds() != null && !bo.getHtbgqds().isEmpty()) {
-            bo.getHtbgqds().forEach(item->{item.setMainDocumentId(bo.getId());});
-            xzdHtglHtbgqdService.saveBatch(bo.getHtbgqds());
-        }
-        //汇总数据
-        xzdHtglHthzsjService.remove(new LambdaQueryWrapper<XzdHtglHthzsj>().eq(XzdHtglHthzsj::getMainDocumentId,bo.getId()));
-        if (bo.getHtghthzsjs() != null && !bo.getHtghthzsjs().isEmpty()) {
-            bo.getHtghthzsjs().forEach(item->{item.setMainDocumentId(bo.getId());});
-            xzdHtglHthzsjService.saveBatch(bo.getHtghthzsjs());
-        }
 
             //项目名称
             if (item.getProject() != null){
@@ -488,6 +486,12 @@ public class XzdPurchaseContractInformationServiceImpl extends ServiceImpl<XzdPu
             lambdaQueryWrapper4.eq(XzdContractDepositInfo::getContractDetailsId, item.getId());
             XzdContractDepositInfo list3 = xzdContractDepositInfoService.getOne(lambdaQueryWrapper4);
             item.setHtzytkyd(list3);
+
+            List<XzdHtglHtbgqd> list4 = xzdHtglHtbgqdService.getBaseMapper().selectList(new LambdaQueryWrapper<XzdHtglHtbgqd>().eq(XzdHtglHtbgqd::getMainDocumentId, item.getId()));
+            item.setHtbgqds(list4);
+            List<XzdHtglHthzsj> xzdHtglHthzsjs = xzdHtglHthzsjService.getBaseMapper().selectList(new LambdaQueryWrapper<XzdHtglHthzsj>().eq(XzdHtglHthzsj::getMainDocumentId, item.getId()));
+            item.setHtghthzsjs(xzdHtglHthzsjs);
+
         }
 
     }