diff --git a/xinnengyuan/ruoyi-admin/src/main/resources/application-dev.yml b/xinnengyuan/ruoyi-admin/src/main/resources/application-dev.yml
index d563a3a7..229ef4d1 100644
--- a/xinnengyuan/ruoyi-admin/src/main/resources/application-dev.yml
+++ b/xinnengyuan/ruoyi-admin/src/main/resources/application-dev.yml
@@ -4,7 +4,7 @@ server:
   port: 8899
 --- # 监控中心配置
 spring.boot.admin.client:
-  # 增加客户端开关
+    # 增加客户端开关
   enabled: false
   url: http://192.168.110.119:9090/admin
   instance:
diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/biddingDocumentList/service/impl/XzdBiddingDocumentServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/biddingDocumentList/service/impl/XzdBiddingDocumentServiceImpl.java
index a859ef02..01ba4517 100644
--- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/biddingDocumentList/service/impl/XzdBiddingDocumentServiceImpl.java
+++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/biddingDocumentList/service/impl/XzdBiddingDocumentServiceImpl.java
@@ -41,6 +41,7 @@ import org.locationtech.jts.edgegraph.HalfEdge;
 import org.springframework.beans.BeanUtils;
 import org.springframework.context.event.EventListener;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 
 import java.time.LocalDate;
@@ -176,6 +177,7 @@ public class XzdBiddingDocumentServiceImpl extends ServiceImpl<XzdBiddingDocumen
      * @return 是否新增成功
      */
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public Boolean insertByBo(XzdBiddingDocumentBoBylist bo) {
         //    投标文件
         XzdBiddingDocumentBo xzdBiddingDocumentbo = bo.getXzdBiddingDocument();
@@ -227,6 +229,7 @@ public class XzdBiddingDocumentServiceImpl extends ServiceImpl<XzdBiddingDocumen
      * @return 是否修改成功
      */
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public Boolean updateByBo(XzdBiddingDocumentBoBylist bo) {
         XzdBiddingDocument update = MapstructUtils.convert(bo.getXzdBiddingDocument(), XzdBiddingDocument.class);
         //    投标文件-技术标
@@ -271,6 +274,7 @@ public class XzdBiddingDocumentServiceImpl extends ServiceImpl<XzdBiddingDocumen
      * @return 是否删除成功
      */
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
 
         if(isValid){
diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/postAnalysis/service/impl/XzdPostBidAnalysisServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/postAnalysis/service/impl/XzdPostBidAnalysisServiceImpl.java
index 7cdd7b9a..71c5f319 100644
--- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/postAnalysis/service/impl/XzdPostBidAnalysisServiceImpl.java
+++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/postAnalysis/service/impl/XzdPostBidAnalysisServiceImpl.java
@@ -32,6 +32,7 @@ import org.dromara.xzd.settlement.domain.vo.XzdJsCgJungonVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.event.EventListener;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 
 import java.util.*;
@@ -144,6 +145,7 @@ public class XzdPostBidAnalysisServiceImpl extends ServiceImpl<XzdPostBidAnalysi
      * @return 是否新增成功
      */
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public Boolean insertByBo(XzdPostBidAnalysisBo bo) {
         XzdPostBidAnalysis add = MapstructUtils.convert(bo, XzdPostBidAnalysis.class);
         String banBen = BatchNumberGenerator.generateBatchNumber("BHFX-");
@@ -172,6 +174,8 @@ public class XzdPostBidAnalysisServiceImpl extends ServiceImpl<XzdPostBidAnalysi
      * @return 是否修改成功
      */
     @Override
+    @Transactional(rollbackFor = Exception.class)
+
     public Boolean updateByBo(XzdPostBidAnalysisBo bo) {
         XzdPostBidAnalysis update = MapstructUtils.convert(bo, XzdPostBidAnalysis.class);
         validEntityBeforeSave(update);
@@ -202,6 +206,7 @@ public class XzdPostBidAnalysisServiceImpl extends ServiceImpl<XzdPostBidAnalysi
      * @return 是否删除成功
      */
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
         if(isValid){
 
diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/comprehensive/domain/XzdHtglHtbgqd.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/comprehensive/domain/XzdHtglHtbgqd.java
index 9ae1893d..b65b33a3 100644
--- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/comprehensive/domain/XzdHtglHtbgqd.java
+++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/comprehensive/domain/XzdHtglHtbgqd.java
@@ -53,6 +53,8 @@ public class XzdHtglHtbgqd extends BaseEntity {
      */
     private String project;
 
+
+
     /**
      * 合同名称（带*，必填）
      */
diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/caigoucontractTermination/service/impl/XzdPurchaseContractSuspendServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/caigoucontractTermination/service/impl/XzdPurchaseContractSuspendServiceImpl.java
index 6473beb9..d32c8cca 100644
--- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/caigoucontractTermination/service/impl/XzdPurchaseContractSuspendServiceImpl.java
+++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/caigoucontractTermination/service/impl/XzdPurchaseContractSuspendServiceImpl.java
@@ -43,6 +43,7 @@ import org.dromara.xzd.contractManagement.caigoucontractTermination.domain.vo.Xz
 import org.dromara.xzd.contractManagement.caigoucontractTermination.domain.XzdPurchaseContractSuspend;
 import org.dromara.xzd.contractManagement.caigoucontractTermination.mapper.XzdPurchaseContractSuspendMapper;
 import org.dromara.xzd.contractManagement.caigoucontractTermination.service.IXzdPurchaseContractSuspendService;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.time.LocalDate;
 import java.util.Arrays;
@@ -191,6 +192,7 @@ public class XzdPurchaseContractSuspendServiceImpl extends ServiceImpl<XzdPurcha
      * @return 是否新增成功
      */
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public Boolean insertByBo(XzdPurchaseContractSuspendBo bo) {
         XzdPurchaseContractSuspend add = MapstructUtils.convert(bo, XzdPurchaseContractSuspend.class);
         validEntityBeforeSave(add);
@@ -222,6 +224,7 @@ public class XzdPurchaseContractSuspendServiceImpl extends ServiceImpl<XzdPurcha
      * @return 是否修改成功
      */
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public Boolean updateByBo(XzdPurchaseContractSuspendBo bo) {
         XzdPurchaseContractSuspend update = MapstructUtils.convert(bo, XzdPurchaseContractSuspend.class);
         validEntityBeforeSave(update);
@@ -253,6 +256,7 @@ public class XzdPurchaseContractSuspendServiceImpl extends ServiceImpl<XzdPurcha
      * @return 是否删除成功
      */
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
         if(isValid){
 
diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/caigouhetongbiangeng/service/impl/XzdPurchaseContractAlterationServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/caigouhetongbiangeng/service/impl/XzdPurchaseContractAlterationServiceImpl.java
index f08f73d5..4e95b573 100644
--- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/caigouhetongbiangeng/service/impl/XzdPurchaseContractAlterationServiceImpl.java
+++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/caigouhetongbiangeng/service/impl/XzdPurchaseContractAlterationServiceImpl.java
@@ -40,6 +40,7 @@ import org.dromara.xzd.contractManagement.caigouhetongbiangeng.domain.vo.XzdPurc
 import org.dromara.xzd.contractManagement.caigouhetongbiangeng.domain.XzdPurchaseContractAlteration;
 import org.dromara.xzd.contractManagement.caigouhetongbiangeng.mapper.XzdPurchaseContractAlterationMapper;
 import org.dromara.xzd.contractManagement.caigouhetongbiangeng.service.IXzdPurchaseContractAlterationService;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.util.*;
 
@@ -253,6 +254,7 @@ public class XzdPurchaseContractAlterationServiceImpl extends ServiceImpl<XzdPur
      * @return 是否新增成功
      */
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public Boolean insertByBo(XzdPurchaseContractAlterationBo bo) {
         XzdPurchaseContractAlteration add = MapstructUtils.convert(bo, XzdPurchaseContractAlteration.class);
         validEntityBeforeSave(add);
@@ -321,6 +323,7 @@ public class XzdPurchaseContractAlterationServiceImpl extends ServiceImpl<XzdPur
      * @return 是否修改成功
      */
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public Boolean updateByBo(XzdPurchaseContractAlterationBo bo) {
         XzdPurchaseContractAlteration add = MapstructUtils.convert(bo, XzdPurchaseContractAlteration.class);
 
@@ -403,6 +406,7 @@ public class XzdPurchaseContractAlterationServiceImpl extends ServiceImpl<XzdPur
      * @return 是否删除成功
      */
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
         for (Long id : ids) {
             XzdPurchaseContractAlterationVo vo = baseMapper.selectVoById(id);
diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/fenbaohetongbiangg/service/impl/XzdSubcontractChangeServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/fenbaohetongbiangg/service/impl/XzdSubcontractChangeServiceImpl.java
index f4bceff7..add68a53 100644
--- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/fenbaohetongbiangg/service/impl/XzdSubcontractChangeServiceImpl.java
+++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/fenbaohetongbiangg/service/impl/XzdSubcontractChangeServiceImpl.java
@@ -39,6 +39,7 @@ import org.dromara.xzd.contractManagement.fenbaohetongbiangg.domain.vo.XzdSubcon
 import org.dromara.xzd.contractManagement.fenbaohetongbiangg.domain.XzdSubcontractChange;
 import org.dromara.xzd.contractManagement.fenbaohetongbiangg.mapper.XzdSubcontractChangeMapper;
 import org.dromara.xzd.contractManagement.fenbaohetongbiangg.service.IXzdSubcontractChangeService;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.util.*;
 
@@ -240,6 +241,7 @@ public class XzdSubcontractChangeServiceImpl extends ServiceImpl<XzdSubcontractC
      * @return 是否新增成功
      */
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public Boolean insertByBo(XzdSubcontractChangeBo bo) {
         XzdSubcontractChange add = MapstructUtils.convert(bo, XzdSubcontractChange.class);
         validEntityBeforeSave(add);
@@ -305,6 +307,7 @@ public class XzdSubcontractChangeServiceImpl extends ServiceImpl<XzdSubcontractC
      * @return 是否修改成功
      */
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public Boolean updateByBo(XzdSubcontractChangeBo bo) {
         XzdSubcontractChange add = MapstructUtils.convert(bo, XzdSubcontractChange.class);
         /**
@@ -386,6 +389,7 @@ public class XzdSubcontractChangeServiceImpl extends ServiceImpl<XzdSubcontractC
      * @return 是否删除成功
      */
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
         if(isValid){
 
diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/fenbaohetongxinxi/service/impl/XzdSubcontractServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/fenbaohetongxinxi/service/impl/XzdSubcontractServiceImpl.java
index aaa60704..fb038f18 100644
--- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/fenbaohetongxinxi/service/impl/XzdSubcontractServiceImpl.java
+++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/fenbaohetongxinxi/service/impl/XzdSubcontractServiceImpl.java
@@ -291,6 +291,7 @@ public class XzdSubcontractServiceImpl extends ServiceImpl<XzdSubcontractMapper,
      * @return 是否新增成功
      */
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public Boolean insertByBo(XzdSubcontractBo bo) {
         XzdSubcontract add = MapstructUtils.convert(bo, XzdSubcontract.class);
         validEntityBeforeSave(add);
@@ -454,6 +455,7 @@ public class XzdSubcontractServiceImpl extends ServiceImpl<XzdSubcontractMapper,
      * @return 是否删除成功
      */
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
         if(isValid){
             //TODO 做一些业务上的校验,判断是否需要校验
diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/jixiehetongbiang/service/impl/XzdMachineryContractAlterationServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/jixiehetongbiang/service/impl/XzdMachineryContractAlterationServiceImpl.java
index 7af5e95f..dd60de76 100644
--- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/jixiehetongbiang/service/impl/XzdMachineryContractAlterationServiceImpl.java
+++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/jixiehetongbiang/service/impl/XzdMachineryContractAlterationServiceImpl.java
@@ -42,6 +42,7 @@ import org.dromara.xzd.contractManagement.jixiehetongbiang.domain.vo.XzdMachiner
 import org.dromara.xzd.contractManagement.jixiehetongbiang.domain.XzdMachineryContractAlteration;
 import org.dromara.xzd.contractManagement.jixiehetongbiang.mapper.XzdMachineryContractAlterationMapper;
 import org.dromara.xzd.contractManagement.jixiehetongbiang.service.IXzdMachineryContractAlterationService;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.util.*;
 
@@ -232,6 +233,7 @@ public class XzdMachineryContractAlterationServiceImpl extends ServiceImpl<XzdMa
      * @return 是否新增成功
      */
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public Boolean insertByBo(XzdMachineryContractAlterationBo bo) {
         XzdMachineryContractAlteration add = MapstructUtils.convert(bo, XzdMachineryContractAlteration.class);
         validEntityBeforeSave(add);
@@ -289,6 +291,7 @@ public class XzdMachineryContractAlterationServiceImpl extends ServiceImpl<XzdMa
      * @return 是否修改成功
      */
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public Boolean updateByBo(XzdMachineryContractAlterationBo bo) {
         XzdMachineryContractAlteration update = MapstructUtils.convert(bo, XzdMachineryContractAlteration.class);
         validEntityBeforeSave(update);
@@ -358,6 +361,7 @@ public class XzdMachineryContractAlterationServiceImpl extends ServiceImpl<XzdMa
      * @return 是否删除成功
      */
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
         if(isValid){
             //TODO 做一些业务上的校验,判断是否需要校验
diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/jixiehetongxinxi/service/impl/XzdContractMachineryServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/jixiehetongxinxi/service/impl/XzdContractMachineryServiceImpl.java
index c549d0c8..2e430223 100644
--- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/jixiehetongxinxi/service/impl/XzdContractMachineryServiceImpl.java
+++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/jixiehetongxinxi/service/impl/XzdContractMachineryServiceImpl.java
@@ -50,6 +50,7 @@ import org.dromara.xzd.contractManagement.jixiehetongxinxi.domain.vo.XzdContract
 import org.dromara.xzd.contractManagement.jixiehetongxinxi.domain.XzdContractMachinery;
 import org.dromara.xzd.contractManagement.jixiehetongxinxi.mapper.XzdContractMachineryMapper;
 import org.dromara.xzd.contractManagement.jixiehetongxinxi.service.IXzdContractMachineryService;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.util.*;
 
@@ -251,6 +252,7 @@ public class XzdContractMachineryServiceImpl extends ServiceImpl<XzdContractMach
      * @return 是否新增成功
      */
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public Boolean insertByBo(XzdContractMachineryBo bo) {
         XzdContractMachinery add = MapstructUtils.convert(bo, XzdContractMachinery.class);
         validEntityBeforeSave(add);
@@ -310,6 +312,7 @@ public class XzdContractMachineryServiceImpl extends ServiceImpl<XzdContractMach
      * @return 是否修改成功
      */
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public Boolean updateByBo(XzdContractMachineryBo bo) {
         XzdContractMachinery update = MapstructUtils.convert(bo, XzdContractMachinery.class);
         validEntityBeforeSave(update);
@@ -380,6 +383,7 @@ public class XzdContractMachineryServiceImpl extends ServiceImpl<XzdContractMach
      * @return 是否删除成功
      */
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
         if(isValid){
             //TODO 做一些业务上的校验,判断是否需要校验
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 46c2a7ea..7171e7bb 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
@@ -50,6 +50,10 @@ import org.dromara.xzd.domain.vo.XzdProjectVo;
 import org.dromara.xzd.domain.vo.XzdSupplierInfoVo;
 import org.dromara.xzd.enums.XzdClassEnum;
 import org.dromara.xzd.enums.ZxdEnum;
+import org.dromara.xzd.mapper.XzdContractAdvanceInfoMapper;
+import org.dromara.xzd.mapper.XzdContractClauseMapper;
+import org.dromara.xzd.mapper.XzdDeductionItemsMapper;
+import org.dromara.xzd.mapper.XzdSettlementRulesMapper;
 import org.dromara.xzd.service.IXzdContractAdvanceInfoService;
 import org.dromara.xzd.service.IXzdContractClauseService;
 import org.dromara.xzd.service.IXzdCorrespondentList;
@@ -60,6 +64,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.context.event.EventListener;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 
 import java.time.LocalDate;
@@ -88,6 +93,9 @@ public class XzdPurchaseContractInformationServiceImpl extends ServiceImpl<XzdPu
     private XzdContractClauseServiceImpl xzdContractClauseService;
     @Autowired
     private XzdSettlementRulesServiceImpl xzdSettlementRulesService;
+    private final XzdSettlementRulesMapper xzdSettlementRulesMapper;
+
+
     @Autowired
     private XzdContractDepositInfoServiceImpl xzdContractDepositInfoService;
 
@@ -105,14 +113,16 @@ public class XzdPurchaseContractInformationServiceImpl extends ServiceImpl<XzdPu
     private IXzdHtglHtbgqdService xzdHtglHtbgqdService;
     @Autowired
     private IXzdHtglHthzsjService xzdHtglHthzsjService;
-    private final AreaUtil areaUtil;
 
 
     private final IXzdContractAdvanceInfoService iXzdContractAdvanceInfoService;
+    private final XzdContractAdvanceInfoMapper xzdContractAdvanceInfoMapper;
 
     private final IXzdDeductionItemsService iXzdDeductionItemsService;
+    private final XzdDeductionItemsMapper xzdDeductionItemsMapper;
 
     private final IXzdContractClauseService iXzdContractClauseService;
+    private final XzdContractClauseMapper xzdContractClauseMapper;
 
     @Autowired
     private XzdBusinessChangeServiceImpl xzdBusinessChangeService;
@@ -240,6 +250,7 @@ public class XzdPurchaseContractInformationServiceImpl extends ServiceImpl<XzdPu
      * @return 是否新增成功
      */
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public Boolean insertByBo(XzdPurchaseContractInformationBo bo) {
         XzdPurchaseContractInformation add = MapstructUtils.convert(bo, XzdPurchaseContractInformation.class);
         validEntityBeforeSave(add);
@@ -307,6 +318,7 @@ public class XzdPurchaseContractInformationServiceImpl extends ServiceImpl<XzdPu
      * @return 是否修改成功
      */
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public Boolean updateByBo(XzdPurchaseContractInformationBo bo) {
         XzdPurchaseContractInformation update = MapstructUtils.convert(bo, XzdPurchaseContractInformation.class);
         validEntityBeforeSave(update);
@@ -318,7 +330,8 @@ public class XzdPurchaseContractInformationServiceImpl extends ServiceImpl<XzdPu
         HashMap<String, Object> hashMap = new HashMap<>();
         hashMap.put("contract_details_id", bo.getId());
         List<XzdContractAdvanceInfo> yskx = bo.getYskx();
-        iXzdContractAdvanceInfoService.getBaseMapper().deleteByMap(hashMap);
+//        iXzdContractAdvanceInfoService.getBaseMapper().deleteByMap(hashMap);
+        xzdContractAdvanceInfoMapper.deleteByDetailsid(bo.getId());
         if (yskx != null){
             yskx.forEach(item -> {
                 item.setTableName(tableName);
@@ -330,7 +343,8 @@ public class XzdPurchaseContractInformationServiceImpl extends ServiceImpl<XzdPu
          * 扣款与奖励项
          */
         List<XzdDeductionItems> kkyjlx = bo.getKkyjlx();
-        iXzdDeductionItemsService.getBaseMapper().deleteByMap(hashMap);
+//        iXzdDeductionItemsService.getBaseMapper().deleteByMap(hashMap);
+        xzdDeductionItemsMapper.deleteByDetailsid(bo.getId());
         if(kkyjlx != null){
             kkyjlx.forEach(item -> {
                 item.setTableName(tableName);
@@ -342,7 +356,8 @@ public class XzdPurchaseContractInformationServiceImpl extends ServiceImpl<XzdPu
          * 合同条款
          */
         List<XzdContractClause> httk = bo.getHttk();
-        iXzdContractClauseService.getBaseMapper().deleteByMap(hashMap);
+//        iXzdContractClauseService.getBaseMapper().deleteByMap(hashMap);
+        xzdContractClauseMapper.deleteByDetailsid(bo.getId());
         if (httk != null){
             httk.forEach(item -> {
                 item.setTableName(tableName);
@@ -352,7 +367,8 @@ public class XzdPurchaseContractInformationServiceImpl extends ServiceImpl<XzdPu
         }
 //        支付条款
         List<XzdSettlementRules> zftk = bo.getZftk();
-        xzdSettlementRulesService.getBaseMapper().deleteByMap(hashMap);
+//        xzdSettlementRulesService.getBaseMapper().deleteByMap(hashMap);
+        xzdSettlementRulesMapper.deleteByDetailsid(bo.getId());
         if(zftk != null){
             zftk.forEach(item ->
                 item.setContractDetailsId(bo.getId()));
@@ -384,8 +400,6 @@ public class XzdPurchaseContractInformationServiceImpl extends ServiceImpl<XzdPu
             xzdHtglHthzsjService.saveBatch(bo.getHtghthzsjs());
         }
 
-
-
         return baseMapper.updateById(update) > 0;
     }
 
@@ -403,6 +417,7 @@ public class XzdPurchaseContractInformationServiceImpl extends ServiceImpl<XzdPu
      * @return 是否删除成功
      */
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
         if(isValid){
 
diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/deposit/refundDeposit/service/impl/XzdFbhtzbjthServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/deposit/refundDeposit/service/impl/XzdFbhtzbjthServiceImpl.java
index e3a2f7a5..af70d21e 100644
--- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/deposit/refundDeposit/service/impl/XzdFbhtzbjthServiceImpl.java
+++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/deposit/refundDeposit/service/impl/XzdFbhtzbjthServiceImpl.java
@@ -30,6 +30,7 @@ import org.dromara.xzd.deposit.refundDeposit.domain.vo.XzdFbhtzbjthVo;
 import org.dromara.xzd.deposit.refundDeposit.domain.XzdFbhtzbjth;
 import org.dromara.xzd.deposit.refundDeposit.mapper.XzdFbhtzbjthMapper;
 import org.dromara.xzd.deposit.refundDeposit.service.IXzdFbhtzbjthService;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.time.LocalDate;
 import java.util.Arrays;
@@ -143,6 +144,7 @@ public class XzdFbhtzbjthServiceImpl extends ServiceImpl<XzdFbhtzbjthMapper, Xzd
      * @return 是否新增成功
      */
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public Boolean insertByBo(XzdFbhtzbjthBo bo) {
         XzdFbhtzbjth add = MapstructUtils.convert(bo, XzdFbhtzbjth.class);
         validEntityBeforeSave(add);
@@ -170,6 +172,7 @@ public class XzdFbhtzbjthServiceImpl extends ServiceImpl<XzdFbhtzbjthMapper, Xzd
      * @return 是否修改成功
      */
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public Boolean updateByBo(XzdFbhtzbjthBo bo) {
         XzdFbhtzbjth update = MapstructUtils.convert(bo, XzdFbhtzbjth.class);
         validEntityBeforeSave(update);
@@ -201,6 +204,7 @@ public class XzdFbhtzbjthServiceImpl extends ServiceImpl<XzdFbhtzbjthMapper, Xzd
      * @return 是否删除成功
      */
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
         if(isValid){
             for (Long id : ids) {
diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/fapiaotaizhang/zengzhishui/service/impl/AppreciationInvoiceServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/fapiaotaizhang/zengzhishui/service/impl/AppreciationInvoiceServiceImpl.java
index 0ba5a117..8996b111 100644
--- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/fapiaotaizhang/zengzhishui/service/impl/AppreciationInvoiceServiceImpl.java
+++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/fapiaotaizhang/zengzhishui/service/impl/AppreciationInvoiceServiceImpl.java
@@ -41,6 +41,7 @@ import org.dromara.xzd.fapiaotaizhang.zengzhishui.domain.vo.AppreciationInvoiceV
 import org.dromara.xzd.fapiaotaizhang.zengzhishui.domain.AppreciationInvoice;
 import org.dromara.xzd.fapiaotaizhang.zengzhishui.mapper.AppreciationInvoiceMapper;
 import org.dromara.xzd.fapiaotaizhang.zengzhishui.service.IAppreciationInvoiceService;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.multipart.MultipartFile;
 
 import java.io.IOException;
@@ -194,6 +195,7 @@ public class AppreciationInvoiceServiceImpl extends ServiceImpl<AppreciationInvo
      * @return 是否新增成功
      */
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public Boolean insertByBo(AppreciationInvoiceBo bo) {
         AppreciationInvoice add = MapstructUtils.convert(bo, AppreciationInvoice.class);
         validEntityBeforeSave(add);
@@ -218,6 +220,7 @@ public class AppreciationInvoiceServiceImpl extends ServiceImpl<AppreciationInvo
      * @return 是否修改成功
      */
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public Boolean updateByBo(AppreciationInvoiceBo bo) {
         AppreciationInvoice update = MapstructUtils.convert(bo, AppreciationInvoice.class);
         validEntityBeforeSave(update);
@@ -249,6 +252,7 @@ public class AppreciationInvoiceServiceImpl extends ServiceImpl<AppreciationInvo
      * @return 是否删除成功
      */
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
         if(isValid){
 
diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/mapper/XzdContractAdvanceInfoMapper.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/mapper/XzdContractAdvanceInfoMapper.java
index ec752178..d72ad7a7 100644
--- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/mapper/XzdContractAdvanceInfoMapper.java
+++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/mapper/XzdContractAdvanceInfoMapper.java
@@ -1,5 +1,6 @@
 package org.dromara.xzd.mapper;
 
+import org.apache.ibatis.annotations.Delete;
 import org.dromara.xzd.domain.XzdContractAdvanceInfo;
 import org.dromara.xzd.domain.vo.XzdContractAdvanceInfoVo;
 import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
@@ -12,4 +13,6 @@ import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
  */
 public interface XzdContractAdvanceInfoMapper extends BaseMapperPlus<XzdContractAdvanceInfo, XzdContractAdvanceInfoVo> {
 
+    @Delete("delete from xzd_contract_advance_info where contract_details_id = #{id}")
+    void deleteByDetailsid(Long id);
 }
diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/mapper/XzdContractClauseMapper.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/mapper/XzdContractClauseMapper.java
index fa122e72..78cc2cc3 100644
--- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/mapper/XzdContractClauseMapper.java
+++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/mapper/XzdContractClauseMapper.java
@@ -1,5 +1,6 @@
 package org.dromara.xzd.mapper;
 
+import org.apache.ibatis.annotations.Delete;
 import org.dromara.xzd.domain.XzdContractClause;
 import org.dromara.xzd.domain.vo.XzdContractClauseVo;
 import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
@@ -12,4 +13,6 @@ import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
  */
 public interface XzdContractClauseMapper extends BaseMapperPlus<XzdContractClause, XzdContractClauseVo> {
 
+    @Delete("delete from xzd_contract_clause where contract_details_id = #{id}")
+    void deleteByDetailsid(Long id);
 }
diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/mapper/XzdDeductionItemsMapper.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/mapper/XzdDeductionItemsMapper.java
index 501a8e22..dbaa18e2 100644
--- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/mapper/XzdDeductionItemsMapper.java
+++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/mapper/XzdDeductionItemsMapper.java
@@ -1,5 +1,6 @@
 package org.dromara.xzd.mapper;
 
+import org.apache.ibatis.annotations.Delete;
 import org.dromara.xzd.domain.XzdDeductionItems;
 import org.dromara.xzd.domain.vo.XzdDeductionItemsVo;
 import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
@@ -12,4 +13,6 @@ import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
  */
 public interface XzdDeductionItemsMapper extends BaseMapperPlus<XzdDeductionItems, XzdDeductionItemsVo> {
 
+    @Delete("delete from xzd_deduction_items where contract_details_id = #{id}")
+    void deleteByDetailsid(Long id);
 }
diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/mapper/XzdSettlementRulesMapper.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/mapper/XzdSettlementRulesMapper.java
index fb71c787..db5d89e4 100644
--- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/mapper/XzdSettlementRulesMapper.java
+++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/mapper/XzdSettlementRulesMapper.java
@@ -1,5 +1,6 @@
 package org.dromara.xzd.mapper;
 
+import org.apache.ibatis.annotations.Delete;
 import org.dromara.xzd.domain.XzdSettlementRules;
 import org.dromara.xzd.domain.vo.XzdSettlementRulesVo;
 import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
@@ -12,4 +13,7 @@ import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
  */
 public interface XzdSettlementRulesMapper extends BaseMapperPlus<XzdSettlementRules, XzdSettlementRulesVo> {
 
+
+    @Delete("delete from xzd_settlement_rules where contract_details_id = #{id}")
+    void deleteByDetailsid(Long id);
 }
diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/fenbaohetongjingdu/service/impl/SettlementOfSubcontractingContractServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/fenbaohetongjingdu/service/impl/SettlementOfSubcontractingContractServiceImpl.java
index 419742bb..76e0833a 100644
--- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/fenbaohetongjingdu/service/impl/SettlementOfSubcontractingContractServiceImpl.java
+++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/fenbaohetongjingdu/service/impl/SettlementOfSubcontractingContractServiceImpl.java
@@ -50,6 +50,7 @@ import org.dromara.xzd.settlement.fenbaohetongjingdu.domain.vo.SettlementOfSubco
 import org.dromara.xzd.settlement.fenbaohetongjingdu.domain.SettlementOfSubcontractingContract;
 import org.dromara.xzd.settlement.fenbaohetongjingdu.mapper.SettlementOfSubcontractingContractMapper;
 import org.dromara.xzd.settlement.fenbaohetongjingdu.service.ISettlementOfSubcontractingContractService;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.time.LocalDate;
 import java.util.*;
@@ -217,6 +218,7 @@ public class SettlementOfSubcontractingContractServiceImpl extends ServiceImpl<S
      * @return 是否新增成功
      */
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public Boolean insertByBo(SettlementOfSubcontractingContractBo bo) {
         SettlementOfSubcontractingContract add = MapstructUtils.convert(bo, SettlementOfSubcontractingContract.class);
         validEntityBeforeSave(add);
@@ -278,6 +280,7 @@ public class SettlementOfSubcontractingContractServiceImpl extends ServiceImpl<S
      * @return 是否修改成功
      */
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public Boolean updateByBo(SettlementOfSubcontractingContractBo bo) {
         SettlementOfSubcontractingContract update = MapstructUtils.convert(bo, SettlementOfSubcontractingContract.class);
         validEntityBeforeSave(update);
@@ -345,6 +348,7 @@ public class SettlementOfSubcontractingContractServiceImpl extends ServiceImpl<S
      * @return 是否删除成功
      */
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
         if(isValid){
             //TODO 做一些业务上的校验,判断是否需要校验
diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/fenbaohetongjungong/service/impl/SettlementOfSubcontractingCompletionServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/fenbaohetongjungong/service/impl/SettlementOfSubcontractingCompletionServiceImpl.java
index d1abb92f..695e931a 100644
--- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/fenbaohetongjungong/service/impl/SettlementOfSubcontractingCompletionServiceImpl.java
+++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/fenbaohetongjungong/service/impl/SettlementOfSubcontractingCompletionServiceImpl.java
@@ -43,6 +43,7 @@ import org.dromara.xzd.settlement.fenbaohetongjungong.domain.vo.SettlementOfSubc
 import org.dromara.xzd.settlement.fenbaohetongjungong.domain.SettlementOfSubcontractingCompletion;
 import org.dromara.xzd.settlement.fenbaohetongjungong.mapper.SettlementOfSubcontractingCompletionMapper;
 import org.dromara.xzd.settlement.fenbaohetongjungong.service.ISettlementOfSubcontractingCompletionService;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.time.LocalDate;
 import java.util.*;
@@ -214,6 +215,7 @@ public class SettlementOfSubcontractingCompletionServiceImpl extends ServiceImpl
      * @return 是否新增成功
      */
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public Boolean insertByBo(SettlementOfSubcontractingCompletionBo bo) {
         SettlementOfSubcontractingCompletion add = MapstructUtils.convert(bo, SettlementOfSubcontractingCompletion.class);
         validEntityBeforeSave(add);
@@ -252,6 +254,7 @@ public class SettlementOfSubcontractingCompletionServiceImpl extends ServiceImpl
      * @return 是否修改成功
      */
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public Boolean updateByBo(SettlementOfSubcontractingCompletionBo bo) {
         SettlementOfSubcontractingCompletion update = MapstructUtils.convert(bo, SettlementOfSubcontractingCompletion.class);
         validEntityBeforeSave(update);
@@ -296,6 +299,7 @@ public class SettlementOfSubcontractingCompletionServiceImpl extends ServiceImpl
      * @return 是否删除成功
      */
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
         if(isValid){
 
diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/fenbaohetongtiaozheng/service/impl/SettlementOfSubcontractingAdjustmentServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/fenbaohetongtiaozheng/service/impl/SettlementOfSubcontractingAdjustmentServiceImpl.java
index 2cc71d81..6ccee392 100644
--- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/fenbaohetongtiaozheng/service/impl/SettlementOfSubcontractingAdjustmentServiceImpl.java
+++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/fenbaohetongtiaozheng/service/impl/SettlementOfSubcontractingAdjustmentServiceImpl.java
@@ -37,6 +37,7 @@ import org.dromara.xzd.settlement.fenbaohetongtiaozheng.domain.vo.SettlementOfSu
 import org.dromara.xzd.settlement.fenbaohetongtiaozheng.domain.SettlementOfSubcontractingAdjustment;
 import org.dromara.xzd.settlement.fenbaohetongtiaozheng.mapper.SettlementOfSubcontractingAdjustmentMapper;
 import org.dromara.xzd.settlement.fenbaohetongtiaozheng.service.ISettlementOfSubcontractingAdjustmentService;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.time.LocalDate;
 import java.util.*;
@@ -156,6 +157,7 @@ public class SettlementOfSubcontractingAdjustmentServiceImpl extends ServiceImpl
      * @return 是否新增成功
      */
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public Boolean insertByBo(SettlementOfSubcontractingAdjustmentBo bo) {
         SettlementOfSubcontractingAdjustment add = MapstructUtils.convert(bo, SettlementOfSubcontractingAdjustment.class);
         validEntityBeforeSave(add);
@@ -195,6 +197,7 @@ public class SettlementOfSubcontractingAdjustmentServiceImpl extends ServiceImpl
      * @return 是否修改成功
      */
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public Boolean updateByBo(SettlementOfSubcontractingAdjustmentBo bo) {
         SettlementOfSubcontractingAdjustment update = MapstructUtils.convert(bo, SettlementOfSubcontractingAdjustment.class);
         validEntityBeforeSave(update);
@@ -241,6 +244,7 @@ public class SettlementOfSubcontractingAdjustmentServiceImpl extends ServiceImpl
      * @return 是否删除成功
      */
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
         if(isValid){
             //TODO 做一些业务上的校验,判断是否需要校验
diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/jixiehetongjiesuan/service/impl/XzdSettlementOfJixieContractServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/jixiehetongjiesuan/service/impl/XzdSettlementOfJixieContractServiceImpl.java
index 10ea58dd..9f4f7a5e 100644
--- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/jixiehetongjiesuan/service/impl/XzdSettlementOfJixieContractServiceImpl.java
+++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/jixiehetongjiesuan/service/impl/XzdSettlementOfJixieContractServiceImpl.java
@@ -32,6 +32,8 @@ import org.dromara.xzd.settlement.domain.vo.XzdContractInventoryVo;
 import org.dromara.xzd.settlement.domain.vo.XzdJsDeductionItemsVo;
 import org.dromara.xzd.settlement.fenbaohetongjingdu.domain.SettlementOfSubcontractingContract;
 import org.dromara.xzd.settlement.fenbaohetongjingdu.domain.vo.SettlementOfSubcontractingContractVo;
+import org.dromara.xzd.settlement.mapper.XzdAlterationInventoryMapper;
+import org.dromara.xzd.settlement.mapper.XzdContractInventoryMapper;
 import org.dromara.xzd.settlement.service.IXzdAlterationInventoryService;
 import org.dromara.xzd.settlement.service.IXzdContractInventoryService;
 import org.dromara.xzd.settlement.service.IXzdJsDeductionItemsService;
@@ -43,6 +45,7 @@ import org.dromara.xzd.settlement.jixiehetongjiesuan.domain.vo.XzdSettlementOfJi
 import org.dromara.xzd.settlement.jixiehetongjiesuan.domain.XzdSettlementOfJixieContract;
 import org.dromara.xzd.settlement.jixiehetongjiesuan.mapper.XzdSettlementOfJixieContractMapper;
 import org.dromara.xzd.settlement.jixiehetongjiesuan.service.IXzdSettlementOfJixieContractService;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.util.*;
 
@@ -66,9 +69,11 @@ public class XzdSettlementOfJixieContractServiceImpl extends ServiceImpl<XzdSett
 
 
     private final IXzdContractInventoryService iXzdContractInventoryService;
+    private final XzdContractInventoryMapper xzdContractInventoryMapper;
 
 
     private final IXzdAlterationInventoryService iXzdAlterationInventoryService;
+    private final XzdAlterationInventoryMapper xzdAlterationInventoryMapper;
 
     @Autowired
     private SysOssServiceImpl sysOssService;
@@ -193,6 +198,7 @@ public class XzdSettlementOfJixieContractServiceImpl extends ServiceImpl<XzdSett
      * @return 是否新增成功
      */
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public Boolean insertByBo(XzdSettlementOfJixieContractBo bo) {
         XzdSettlementOfJixieContract add = MapstructUtils.convert(bo, XzdSettlementOfJixieContract.class);
         validEntityBeforeSave(add);
@@ -204,9 +210,6 @@ public class XzdSettlementOfJixieContractServiceImpl extends ServiceImpl<XzdSett
         if (flag) {
             bo.setId(add.getId());
         }
-
-
-
         //        合同内清单
         List<XzdContractInventoryBo> htnqd = bo.getHtnqd();
         if (htnqd != null && htnqd.size() > 0) {
@@ -256,12 +259,20 @@ public class XzdSettlementOfJixieContractServiceImpl extends ServiceImpl<XzdSett
      * @return 是否修改成功
      */
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public Boolean updateByBo(XzdSettlementOfJixieContractBo bo) {
+        long l = System.currentTimeMillis();
         XzdSettlementOfJixieContract update = MapstructUtils.convert(bo, XzdSettlementOfJixieContract.class);
         validEntityBeforeSave(update);
 
         //        变更清单
-        iXzdAlterationInventoryService.getBaseMapper().delete(new LambdaQueryWrapper<XzdAlterationInventory>().eq(XzdAlterationInventory::getPrimaryMeterId, bo.getId()));
+        xzdAlterationInventoryMapper.delByMeterId(bo.getId());
+        xzdContractInventoryMapper.delByMeterId(bo.getId(),ZxdEnum.HETONGLEIXINGNEI.getTypeValue());
+        xzdContractInventoryMapper.delByMeterId(bo.getId(),ZxdEnum.HETONGLEIXING.getTypeValue());
+//        iXzdAlterationInventoryService.remove(new LambdaQueryWrapper<XzdAlterationInventory>().eq(XzdAlterationInventory::getPrimaryMeterId, bo.getId()));
+//        iXzdContractInventoryService.remove(new LambdaQueryWrapper<XzdContractInventory>().eq(XzdContractInventory::getPrimaryMeterId, bo.getId()).eq(XzdContractInventory::getType, ZxdEnum.HETONGLEIXINGNEI.getTypeValue()));
+//        iXzdContractInventoryService.remove(new LambdaQueryWrapper<XzdContractInventory>().eq(XzdContractInventory::getPrimaryMeterId, bo.getId()).eq(XzdContractInventory::getType,ZxdEnum.HETONGLEIXING.getTypeValue()));
+
         List<XzdAlterationInventoryBo> bgzjqd = bo.getBgzjqd();
         if (bgzjqd != null && bgzjqd.size() > 0) {
             bgzjqd.forEach(temp ->{
@@ -272,7 +283,6 @@ public class XzdSettlementOfJixieContractServiceImpl extends ServiceImpl<XzdSett
         }
         //        合同内清单
         List<XzdContractInventoryBo> htnqd = bo.getHtnqd();
-        iXzdContractInventoryService.getBaseMapper().delete(new LambdaQueryWrapper<XzdContractInventory>().eq(XzdContractInventory::getPrimaryMeterId, bo.getId()).eq(XzdContractInventory::getContractType, ZxdEnum.HETONGLEIXINGNEI.getTypeValue()));
         if (htnqd != null && htnqd.size() > 0) {
             htnqd.forEach(temp ->{
                 temp.setContractType(ZxdEnum.JIXIEHTTONG.getTypeValue());
@@ -283,7 +293,6 @@ public class XzdSettlementOfJixieContractServiceImpl extends ServiceImpl<XzdSett
         }
 //        合同外清单
         List<XzdContractInventoryBo> htwqd = bo.getHtwqd();
-        iXzdContractInventoryService.getBaseMapper().delete(new LambdaQueryWrapper<XzdContractInventory>().eq(XzdContractInventory::getPrimaryMeterId, bo.getId()).eq(XzdContractInventory::getContractType,ZxdEnum.HETONGLEIXING.getTypeValue()));
         if (htwqd != null && htwqd.size() > 0) {
             htwqd.forEach(temp ->{
                 temp.setContractType(ZxdEnum.JIXIEHTTONG.getTypeValue());
@@ -306,7 +315,9 @@ public class XzdSettlementOfJixieContractServiceImpl extends ServiceImpl<XzdSett
             });
             deductionItemsService.saveBatch(MapstructUtils.convert(jlykk, XzdJsDeductionItems.class));
         }
+        System.out.println(System.currentTimeMillis() - l +"sssssssssssssssssssssssss");
         return baseMapper.updateById(update) > 0;
+
     }
 
     /**
diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/jixiehetongjungong/controller/XzdSettlementOfJixieCompletionController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/jixiehetongjungong/controller/XzdSettlementOfJixieCompletionController.java
index e1bd5e8f..6f6baef2 100644
--- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/jixiehetongjungong/controller/XzdSettlementOfJixieCompletionController.java
+++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/jixiehetongjungong/controller/XzdSettlementOfJixieCompletionController.java
@@ -35,7 +35,7 @@ import org.dromara.common.mybatis.core.page.TableDataInfo;
 @Validated
 @RequiredArgsConstructor
 @RestController
-@RequestMapping("/jixiehetongjungong/settlementOfJixieCompletion")
+@RequestMapping("/xzd/jixiehetongjungong/settlementOfJixieCompletion")
 public class XzdSettlementOfJixieCompletionController extends BaseController {
 
     private final IXzdSettlementOfJixieCompletionService xzdSettlementOfJixieCompletionService;
diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/jixiehetongjungong/service/impl/XzdSettlementOfJixieCompletionServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/jixiehetongjungong/service/impl/XzdSettlementOfJixieCompletionServiceImpl.java
index 019ebb7d..f0ff9c1d 100644
--- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/jixiehetongjungong/service/impl/XzdSettlementOfJixieCompletionServiceImpl.java
+++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/jixiehetongjungong/service/impl/XzdSettlementOfJixieCompletionServiceImpl.java
@@ -36,6 +36,7 @@ import org.dromara.xzd.settlement.jixiehetongjungong.domain.vo.XzdSettlementOfJi
 import org.dromara.xzd.settlement.jixiehetongjungong.domain.XzdSettlementOfJixieCompletion;
 import org.dromara.xzd.settlement.jixiehetongjungong.mapper.XzdSettlementOfJixieCompletionMapper;
 import org.dromara.xzd.settlement.jixiehetongjungong.service.IXzdSettlementOfJixieCompletionService;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.util.Arrays;
 import java.util.List;
@@ -162,6 +163,7 @@ public class XzdSettlementOfJixieCompletionServiceImpl extends ServiceImpl<XzdSe
      * @return 是否新增成功
      */
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public Boolean insertByBo(XzdSettlementOfJixieCompletionBo bo) {
         XzdSettlementOfJixieCompletion add = MapstructUtils.convert(bo, XzdSettlementOfJixieCompletion.class);
         validEntityBeforeSave(add);
@@ -200,6 +202,7 @@ public class XzdSettlementOfJixieCompletionServiceImpl extends ServiceImpl<XzdSe
      * @return 是否修改成功
      */
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public Boolean updateByBo(XzdSettlementOfJixieCompletionBo bo) {
         XzdSettlementOfJixieCompletion update = MapstructUtils.convert(bo, XzdSettlementOfJixieCompletion.class);
         validEntityBeforeSave(update);
@@ -244,6 +247,7 @@ public class XzdSettlementOfJixieCompletionServiceImpl extends ServiceImpl<XzdSe
      * @return 是否删除成功
      */
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
         if(isValid){
             //TODO 做一些业务上的校验,判断是否需要校验
diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/mapper/XzdAlterationInventoryMapper.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/mapper/XzdAlterationInventoryMapper.java
index c1d00c80..f246d68e 100644
--- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/mapper/XzdAlterationInventoryMapper.java
+++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/mapper/XzdAlterationInventoryMapper.java
@@ -1,5 +1,8 @@
 package org.dromara.xzd.settlement.mapper;
 
+import jakarta.validation.constraints.NotNull;
+import org.apache.ibatis.annotations.Delete;
+import org.apache.ibatis.annotations.Param;
 import org.dromara.xzd.settlement.domain.XzdAlterationInventory;
 import org.dromara.xzd.settlement.domain.vo.XzdAlterationInventoryVo;
 import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
@@ -12,4 +15,6 @@ import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
  */
 public interface XzdAlterationInventoryMapper extends BaseMapperPlus<XzdAlterationInventory, XzdAlterationInventoryVo> {
 
+    @Delete("delete from xzd_alteration_inventory where primary_meter_id = #{id}")
+    void delByMeterId(@Param("id") Long id);
 }
diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/mapper/XzdContractInventoryMapper.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/mapper/XzdContractInventoryMapper.java
index 467e0f45..21ce4278 100644
--- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/mapper/XzdContractInventoryMapper.java
+++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/mapper/XzdContractInventoryMapper.java
@@ -1,5 +1,7 @@
 package org.dromara.xzd.settlement.mapper;
 
+import jakarta.validation.constraints.NotNull;
+import org.apache.ibatis.annotations.Delete;
 import org.dromara.xzd.settlement.domain.XzdContractInventory;
 import org.dromara.xzd.settlement.domain.vo.XzdContractInventoryVo;
 import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
@@ -12,4 +14,7 @@ import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
  */
 public interface XzdContractInventoryMapper extends BaseMapperPlus<XzdContractInventory, XzdContractInventoryVo> {
 
+
+    @Delete("delete from xzd_contract_inventory where primary_meter_id = #{id} and type = #{typeValue}")
+    void delByMeterId( Long id, String typeValue);
 }
diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/skyfk/jixiehetong/fkxx/service/impl/XzdSfkJixieFkServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/skyfk/jixiehetong/fkxx/service/impl/XzdSfkJixieFkServiceImpl.java
index a31e9909..afca4125 100644
--- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/skyfk/jixiehetong/fkxx/service/impl/XzdSfkJixieFkServiceImpl.java
+++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/skyfk/jixiehetong/fkxx/service/impl/XzdSfkJixieFkServiceImpl.java
@@ -35,6 +35,7 @@ import org.dromara.xzd.skyfk.jixiehetong.fkxx.domain.vo.XzdSfkJixieFkVo;
 import org.dromara.xzd.skyfk.jixiehetong.fkxx.domain.XzdSfkJixieFk;
 import org.dromara.xzd.skyfk.jixiehetong.fkxx.mapper.XzdSfkJixieFkMapper;
 import org.dromara.xzd.skyfk.jixiehetong.fkxx.service.IXzdSfkJixieFkService;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.math.BigDecimal;
 import java.util.*;
@@ -167,6 +168,7 @@ public class XzdSfkJixieFkServiceImpl extends ServiceImpl<XzdSfkJixieFkMapper, X
      * @return 是否新增成功
      */
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public Boolean insertByBo(XzdSfkJixieFkBo bo) {
         XzdSfkJixieFk add = MapstructUtils.convert(bo, XzdSfkJixieFk.class);
         validEntityBeforeSave(add);
@@ -197,6 +199,7 @@ public class XzdSfkJixieFkServiceImpl extends ServiceImpl<XzdSfkJixieFkMapper, X
      * @return 是否修改成功
      */
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public Boolean updateByBo(XzdSfkJixieFkBo bo) {
         XzdSfkJixieFk update = MapstructUtils.convert(bo, XzdSfkJixieFk.class);
         validEntityBeforeSave(update);
@@ -244,6 +247,7 @@ public class XzdSfkJixieFkServiceImpl extends ServiceImpl<XzdSfkJixieFkMapper, X
      * @return 是否删除成功
      */
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
         if(isValid){
             //TODO 做一些业务上的校验,判断是否需要校验
diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/zijinjihua/yueduzijinbiangeng/service/impl/FinancialRevenuePlanAlterationServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/zijinjihua/yueduzijinbiangeng/service/impl/FinancialRevenuePlanAlterationServiceImpl.java
index 94033411..c06d6425 100644
--- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/zijinjihua/yueduzijinbiangeng/service/impl/FinancialRevenuePlanAlterationServiceImpl.java
+++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/zijinjihua/yueduzijinbiangeng/service/impl/FinancialRevenuePlanAlterationServiceImpl.java
@@ -244,6 +244,7 @@ public class FinancialRevenuePlanAlterationServiceImpl extends ServiceImpl<Finan
      * @return 是否修改成功
      */
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public Boolean updateByBo(FinancialRevenuePlanAlterationBo bo) {
         FinancialRevenuePlanAlteration update = MapstructUtils.convert(bo, FinancialRevenuePlanAlteration.class);
         validEntityBeforeSave(update);
@@ -287,6 +288,7 @@ public class FinancialRevenuePlanAlterationServiceImpl extends ServiceImpl<Finan
      * @return 是否删除成功
      */
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
         if(isValid){
             //TODO 做一些业务上的校验,判断是否需要校验
diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/zijinjihua/yueduzijinjihua/service/impl/FinancialRevenueExpenditurePlanServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/zijinjihua/yueduzijinjihua/service/impl/FinancialRevenueExpenditurePlanServiceImpl.java
index fa4dd5a8..c55c13e8 100644
--- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/zijinjihua/yueduzijinjihua/service/impl/FinancialRevenueExpenditurePlanServiceImpl.java
+++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/zijinjihua/yueduzijinjihua/service/impl/FinancialRevenueExpenditurePlanServiceImpl.java
@@ -257,6 +257,7 @@ public class FinancialRevenueExpenditurePlanServiceImpl extends ServiceImpl<Fina
      * @return 是否修改成功
      */
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public Boolean updateByBo(FinancialRevenueExpenditurePlanBo bo) {
         FinancialRevenueExpenditurePlan update = MapstructUtils.convert(bo, FinancialRevenueExpenditurePlan.class);
         List<DetailOfEarningsBo> detailOfEarnings = bo.getDetailOfEarnings();
@@ -298,6 +299,7 @@ public class FinancialRevenueExpenditurePlanServiceImpl extends ServiceImpl<Fina
      * @return 是否删除成功
      */
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
         if(isValid){