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

---
 .../org/dromara/xzd/domain/bo/XzdSupplierInfoBo.java   |  6 ++++--
 .../xzd/service/impl/XzdContractChangeServiceImpl.java | 10 ++++++----
 .../service/impl/XzdContractDetailsServiceImpl.java    |  3 +++
 .../resources/mapper/xzd/XzdSupplierInfoMapper.xml     |  4 ++--
 4 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/bo/XzdSupplierInfoBo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/bo/XzdSupplierInfoBo.java
index e0bd0df3..c809742c 100644
--- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/bo/XzdSupplierInfoBo.java
+++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/bo/XzdSupplierInfoBo.java
@@ -314,13 +314,15 @@ public class XzdSupplierInfoBo extends BaseEntity {
     /**
      * 合格有效期开始时间
      */
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd")
     private Date startTime;
 
     /**
      * 合格有效期结束时间
      */
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd")
     private Date endTime;
 
     /**
diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/service/impl/XzdContractChangeServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/service/impl/XzdContractChangeServiceImpl.java
index ccd29dfc..6abc2dbd 100644
--- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/service/impl/XzdContractChangeServiceImpl.java
+++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/service/impl/XzdContractChangeServiceImpl.java
@@ -427,11 +427,13 @@ public class XzdContractChangeServiceImpl extends ServiceImpl<XzdContractChangeM
             //通过合同编码拿到合同信息
             if (vo.getContractCodeId() != null){
                 XzdContractDetailsVo xzdContractDetailsVo = xzdContractDetailsService.queryById(vo.getContractCodeId());
-                List<XzdContractDetailsVo> xzdContractDetailsVo1 = List.of(xzdContractDetailsVo);
-                xzdContractDetailsService.setValue(xzdContractDetailsVo1);
-                xzdContractDetailsVo = xzdContractDetailsVo1.getFirst();
+                if (xzdContractDetailsVo != null) {
+                    List<XzdContractDetailsVo> xzdContractDetailsVo1 = List.of(xzdContractDetailsVo);
+                    xzdContractDetailsService.setValue(xzdContractDetailsVo1);
+                    xzdContractDetailsVo = xzdContractDetailsVo1.getFirst();
 
-                vo.setContract(xzdContractDetailsVo);
+                    vo.setContract(xzdContractDetailsVo);
+                }
             }
 
             //所属组织
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 3941586f..2b449347 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
@@ -93,6 +93,9 @@ public class XzdContractDetailsServiceImpl extends ServiceImpl<XzdContractDetail
     @Override
     public XzdContractDetailsVo queryById(Long id){
         XzdContractDetailsVo xzdContractDetailsVo = baseMapper.selectVoById(id);
+        if (xzdContractDetailsVo == null) {
+            return null;
+        }
         List<XzdContractDetailsVo> xzdContractDetailsVo1 = List.of(xzdContractDetailsVo);
         setValue(xzdContractDetailsVo1);
         return xzdContractDetailsVo1.getFirst();
diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/resources/mapper/xzd/XzdSupplierInfoMapper.xml b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/resources/mapper/xzd/XzdSupplierInfoMapper.xml
index 80eb7b92..74cc45e6 100644
--- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/resources/mapper/xzd/XzdSupplierInfoMapper.xml
+++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/resources/mapper/xzd/XzdSupplierInfoMapper.xml
@@ -54,11 +54,11 @@
             </if>
 
             <if test='bo.startTime != null'>
-                AND supplement.create_date &gt;= #{bo.startTime}
+                AND supplement.qualification_validity &gt;= #{bo.startTime}
             </if>
 
             <if test='bo.endTime != null'>
-                AND supplement.create_date &lt;= #{bo.endTime}
+                AND supplement.qualification_validity &lt;= #{bo.endTime}
             </if>
 
             <if test='bo.shzt != null and bo.shzt != ""'>