From 0d5a9eb505e7334e5de29d44361c16ba29d46089 Mon Sep 17 00:00:00 2001
From: lg <lg@163.com>
Date: Thu, 23 Oct 2025 17:18:36 +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

---
 .../bo/XzdPurchaseContractSuspendBo.java      |  6 +++++
 ...XzdPurchaseContractSuspendServiceImpl.java |  5 ++++
 .../impl/XzdSubcontractServiceImpl.java       |  3 +++
 .../vo/XzdPurchaseContractInformationVo.java  |  7 ++++++
 ...urchaseContractInformationServiceImpl.java | 23 ++++++++++++++-----
 5 files changed, 38 insertions(+), 6 deletions(-)

diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/caigoucontractTermination/domain/bo/XzdPurchaseContractSuspendBo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/caigoucontractTermination/domain/bo/XzdPurchaseContractSuspendBo.java
index 9c7e1cd0..bcd3ae55 100644
--- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/caigoucontractTermination/domain/bo/XzdPurchaseContractSuspendBo.java
+++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/caigoucontractTermination/domain/bo/XzdPurchaseContractSuspendBo.java
@@ -129,4 +129,10 @@ public class XzdPurchaseContractSuspendBo extends BaseEntity {
     private String auditStatus;
 
 
+    private LocalDate startDate;
+
+
+    private LocalDate endDate;
+
+
 }
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 1aaffd0c..50da08db 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
@@ -150,6 +150,11 @@ public class XzdPurchaseContractSuspendServiceImpl extends ServiceImpl<XzdPurcha
         lqw.eq(StringUtils.isNotBlank(bo.getReceiptsCode()), XzdPurchaseContractSuspend::getReceiptsCode, bo.getReceiptsCode());
         lqw.eq(StringUtils.isNotBlank(bo.getTitle()), XzdPurchaseContractSuspend::getTitle, bo.getTitle());
         lqw.eq(bo.getDocumentDate() != null, XzdPurchaseContractSuspend::getDocumentDate, bo.getDocumentDate());
+        lqw.ge(bo.getStartDate() != null, XzdPurchaseContractSuspend::getDocumentDate, bo.getStartDate());
+        lqw.le(bo.getEndDate() != null, XzdPurchaseContractSuspend::getDocumentDate, bo.getEndDate());
+
+
+
         lqw.like(StringUtils.isNotBlank(bo.getContractName()), XzdPurchaseContractSuspend::getContractName, bo.getContractName());
         lqw.eq(bo.getTerminationDate() != null, XzdPurchaseContractSuspend::getTerminationDate, bo.getTerminationDate());
         lqw.eq(StringUtils.isNotBlank(bo.getProject()), XzdPurchaseContractSuspend::getProject, bo.getProject());
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 50fe2a87..eb323d76 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
@@ -91,6 +91,9 @@ public class XzdSubcontractServiceImpl extends ServiceImpl<XzdSubcontractMapper,
     @Override
     public XzdSubcontractVo queryById(Long id){
         XzdSubcontractVo xzdSubcontractVo = baseMapper.selectVoById(id);
+        if (xzdSubcontractVo == null){
+            return null;
+        }
         List<XzdSubcontractVo> informationVo = List.of(xzdSubcontractVo);
         //        装填数据
         setValue(informationVo);
diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/purchaseManagement/domain/vo/XzdPurchaseContractInformationVo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/purchaseManagement/domain/vo/XzdPurchaseContractInformationVo.java
index 106a02e4..0055c35e 100644
--- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/purchaseManagement/domain/vo/XzdPurchaseContractInformationVo.java
+++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/purchaseManagement/domain/vo/XzdPurchaseContractInformationVo.java
@@ -153,6 +153,7 @@ public class XzdPurchaseContractInformationVo implements Serializable {
      * 管理组织名称
      */
     @ExcelProperty(value = "管理组织名称")
+    @Translation(type = TransConstant.DEPT_ID_TO_NAME, mapper = "managementOrganization")
     private String managementOrganizationName;
 
     /**
@@ -315,6 +316,12 @@ public class XzdPurchaseContractInformationVo implements Serializable {
     @ExcelProperty(value = "关联主合同")
     private String associatedMainContract;
 
+    /**
+     * 关联主合同
+     */
+    @ExcelProperty(value = "关联主合同")
+    private String associatedMainContractName;
+
     /**
      * 项目责任人
      */
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 31680183..4a760515 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
@@ -410,6 +410,17 @@ public class XzdPurchaseContractInformationServiceImpl extends ServiceImpl<XzdPu
                     item.setProjectName(projectName);
                 }
             }
+
+            //其他项目名称
+            if (item.getProject() != null){
+                if (StringUtils.isNotEmpty(item.getAssociatedMainContract())){
+                    String projectName = xzdProjectService.queryNameById(Long.parseLong(item.getAssociatedMainContract()));
+                    if (projectName != null){
+                        item.setAssociatedMainContractName(projectName);
+                    }
+                }
+
+            }
             //其他收入合同项目名称
             if (item.getOtherIncomeContractProject() != null){
                 String projectName = xzdProjectService.queryNameById(item.getOtherIncomeContractProject());
@@ -431,12 +442,12 @@ public class XzdPurchaseContractInformationServiceImpl extends ServiceImpl<XzdPu
                     item.setPartyBUnitName(unitName);
                 }
             }
-            //管理组织(供应商)
-            String unitName = xzdSupplierInfoService.queryNameById(item.getPartyBUnit());
-
-            if (unitName != null){
-                item.setManagementOrganizationName(unitName);
-            }
+//            //管理组织
+//            String unitName = xzdSupplierInfoService.queryNameById(item.getManagementOrganization());
+//
+//            if (unitName != null){
+//                item.setManagementOrganizationName(unitName);
+//            }
             //开票单位名称(供应商名称)
             String unitName1 = xzdSupplierInfoService.queryNameById(item.getInvoiceIssuingUnit());
             if (unitName1 != null){