From 7bdf8f53b942da2cec3daf3dda3c85534deb8551 Mon Sep 17 00:00:00 2001
From: lg <lg@163.com>
Date: Sat, 18 Oct 2025 18:45:25 +0800
Subject: [PATCH] =?UTF-8?q?=E9=87=87=E8=B4=AD=E5=90=88=E5=90=8C=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...zdPurchaseContractInformationServiceImpl.java | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 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 50946085..6158501c 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
@@ -240,7 +240,6 @@ public class XzdPurchaseContractInformationServiceImpl extends ServiceImpl<XzdPu
 
         return flag;
     }
-
     /**
      * 修改采购合同信息
      *
@@ -299,13 +298,8 @@ public class XzdPurchaseContractInformationServiceImpl extends ServiceImpl<XzdPu
                 item.setContractDetailsId(bo.getId()));
         }
         xzdSettlementRulesService.saveOrUpdateBatch(bo.getZftk());
-
-
-
         bo.getHtzytkyd().setTableName(XzdClassEnum.PURCHASE_CONTRACT_INFORMATION.getClassName());
         xzdContractDepositInfoService.saveOrUpdate(bo.getHtzytkyd());
-
-
         return baseMapper.updateById(update) > 0;
     }
 
@@ -315,7 +309,6 @@ public class XzdPurchaseContractInformationServiceImpl extends ServiceImpl<XzdPu
     private void validEntityBeforeSave(XzdPurchaseContractInformation entity){
         //TODO 做一些数据校验,如唯一约束
     }
-
     /**
      * 校验并批量删除采购合同信息信息
      *
@@ -379,6 +372,13 @@ public class XzdPurchaseContractInformationServiceImpl extends ServiceImpl<XzdPu
                     item.setProjectName(projectName);
                 }
             }
+            //其他收入合同项目名称
+            if (item.getOtherIncomeContractProject() != null){
+                String projectName = xzdProjectService.queryNameById(item.getOtherIncomeContractProject());
+                if (projectName != null){
+                    item.setOtherIncomeContractProjectName(projectName);
+                }
+            }
             //甲方单位(客户信息列表)
             R<QuerCorrespondentDto> byid = iXzdCorrespondentList.getCustomerByid(item.getPartyAUnit());
             if (byid!=null){
@@ -451,8 +451,6 @@ public class XzdPurchaseContractInformationServiceImpl extends ServiceImpl<XzdPu
             lambdaQueryWrapper4.eq(XzdContractDepositInfo::getContractDetailsId, item.getId());
             XzdContractDepositInfo list3 = xzdContractDepositInfoService.getOne(lambdaQueryWrapper4);
             item.setHtzytkyd(list3);
-
-
         }
 
     }