From 61244321a747c3c551e9d86691a9852c493c514f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B1=88=E5=B1=95=E8=88=AA?= <2426745133@qq.com>
Date: Wed, 22 Oct 2025 20:10:10 +0800
Subject: [PATCH] =?UTF-8?q?10-22-bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../xzd/service/impl/XzdContractAccountServiceImpl.java     | 2 +-
 .../xzd/service/impl/XzdContractDetailsServiceImpl.java     | 6 ++++++
 .../xzd/service/impl/XzdContractTerminationServiceImpl.java | 5 +++++
 .../xzd/service/impl/XzdSupplierInfoServiceImpl.java        | 5 +++--
 .../xzd/skyfk/cbhtsc/domain/vo/XzdContractPaymentVo.java    | 5 +++++
 .../cbhtsc/service/impl/XzdContractPaymentServiceImpl.java  | 2 ++
 6 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/service/impl/XzdContractAccountServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/service/impl/XzdContractAccountServiceImpl.java
index 73acfab5..df6669aa 100644
--- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/service/impl/XzdContractAccountServiceImpl.java
+++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/service/impl/XzdContractAccountServiceImpl.java
@@ -379,7 +379,7 @@ public class XzdContractAccountServiceImpl extends ServiceImpl<XzdContractAccoun
                     R<QuerCorrespondentDto> byid2 = iXzdCorrespondentList.getCustomerByid(vo.getSupervision());
                     if (byid2 != null) {
                         if (byid2.getData().getXzdCustomerinformation() != null) {
-                            vo.setOwnerName(byid2.getData().getXzdCustomerinformation().getUnitName());
+                            vo.setSupervisionName(byid2.getData().getXzdCustomerinformation().getUnitName());
                         }
                     }
                 }
diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/service/impl/XzdContractDetailsServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/service/impl/XzdContractDetailsServiceImpl.java
index 480e1d9b..3941586f 100644
--- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/service/impl/XzdContractDetailsServiceImpl.java
+++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/service/impl/XzdContractDetailsServiceImpl.java
@@ -81,6 +81,8 @@ public class XzdContractDetailsServiceImpl extends ServiceImpl<XzdContractDetail
     private XzdSupplierOpenBankServiceImpl xzdSupplierOpenBankService;
     @Autowired
     private IXzdHtglHtbgqdService xzdHtglHtbgqdService;
+    @Autowired
+    private XzdProjectTypeServiceImpl xzdProjectTypeService;
 
     /**
      * 查询承包合同信息
@@ -460,6 +462,10 @@ public class XzdContractDetailsServiceImpl extends ServiceImpl<XzdContractDetail
                 if (projectVo != null) {
                     info.setProjectName(projectVo.getProjectName());
                     info.setProjectType(projectVo.getProjectTypeName());
+                    XzdProjectTypeVo bigType = xzdProjectTypeService.getBigType(projectVo.getProjectType());
+                    if (bigType != null){
+                        info.setProjectCategory(bigType.getTypeName());
+                    }
                 }
             }
             //甲方单位(客户信息列表)
diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/service/impl/XzdContractTerminationServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/service/impl/XzdContractTerminationServiceImpl.java
index 5c6d71c1..7645640e 100644
--- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/service/impl/XzdContractTerminationServiceImpl.java
+++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/service/impl/XzdContractTerminationServiceImpl.java
@@ -184,4 +184,9 @@ public class XzdContractTerminationServiceImpl extends ServiceImpl<XzdContractTe
         }
         return baseMapper.deleteByIds(ids) > 0;
     }
+
+    public void setValue(List<XzdContractTerminationVo> vos){
+
+    }
+
 }
diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/service/impl/XzdSupplierInfoServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/service/impl/XzdSupplierInfoServiceImpl.java
index 3bafa4c3..90dce5e3 100644
--- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/service/impl/XzdSupplierInfoServiceImpl.java
+++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/service/impl/XzdSupplierInfoServiceImpl.java
@@ -758,8 +758,9 @@ public class XzdSupplierInfoServiceImpl extends ServiceImpl<XzdSupplierInfoMappe
             bankLambdaQueryWrapper.clear();
             bankLambdaQueryWrapper.eq(XzdSupplierOpenBank::getSupplierId,vo.getId());
             List<XzdSupplierOpenBank> openBanks = xzdSupplierOpenBankService.list(bankLambdaQueryWrapper);
-            vo.getSettlement().setOpenBanks(openBanks);
-
+            if (vo.getSettlement() != null && openBanks != null && !openBanks.isEmpty()) {
+                vo.getSettlement().setOpenBanks(openBanks);
+            }
             //处理业务信息
             LambdaQueryWrapper<XzdBusinessInfo> businessInfoLambdaQueryWrapper = new LambdaQueryWrapper<>();
             businessInfoLambdaQueryWrapper.eq(XzdBusinessInfo::getCustomerinformationId,vo.getId()).eq(XzdBusinessInfo::getType,"2");
diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/skyfk/cbhtsc/domain/vo/XzdContractPaymentVo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/skyfk/cbhtsc/domain/vo/XzdContractPaymentVo.java
index e6827e23..bb7e9656 100644
--- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/skyfk/cbhtsc/domain/vo/XzdContractPaymentVo.java
+++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/skyfk/cbhtsc/domain/vo/XzdContractPaymentVo.java
@@ -70,6 +70,11 @@ public class XzdContractPaymentVo implements Serializable {
     @ExcelProperty(value = "合同id")
     private Long contractId;
 
+    /**
+     * 合同名称
+     */
+    private String contractName;
+
     /**
      * 合同编码
      */
diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/skyfk/cbhtsc/service/impl/XzdContractPaymentServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/skyfk/cbhtsc/service/impl/XzdContractPaymentServiceImpl.java
index 836d8612..f166b8ff 100644
--- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/skyfk/cbhtsc/service/impl/XzdContractPaymentServiceImpl.java
+++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/skyfk/cbhtsc/service/impl/XzdContractPaymentServiceImpl.java
@@ -297,6 +297,8 @@ public class XzdContractPaymentServiceImpl extends ServiceImpl<XzdContractPaymen
                     xzdContractDetailsVo = xzdContractDetailsVo1.getFirst();
                     //合同编码
                     vo.setContractCode(xzdContractDetailsVo.getContractCode());
+                    //合同名称
+                    vo.setContractName(xzdContractDetailsVo.getContractName());
                 }
             }
             //收款银行名称