From df4a47235995bedae1f89327d521c0281f42c97b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9Clyd=E2=80=9D?= <“lyd@datametatech.com”>
Date: Wed, 12 Mar 2025 01:34:22 +0800
Subject: [PATCH] =?UTF-8?q?fixbug:=E5=A0=A4=E9=98=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../yxgh/df/service/DfCheckingProblemV2Service.java  | 12 +++++++-----
 .../yxgh/df/service/DfCheckingRecordV2Service.java   |  2 +-
 .../java/com/kms/yxgh/df/service/DfYhV2Service.java  | 11 +++++++----
 3 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/service/DfCheckingProblemV2Service.java b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfCheckingProblemV2Service.java
index 043332ab..c34acdf9 100644
--- a/shuili-system/src/main/java/com/kms/yxgh/df/service/DfCheckingProblemV2Service.java
+++ b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfCheckingProblemV2Service.java
@@ -16,6 +16,7 @@ import lombok.AllArgsConstructor;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
+import java.util.Objects;
 import java.util.Optional;
 import java.util.stream.Collectors;
 
@@ -60,12 +61,13 @@ public class DfCheckingProblemV2Service extends BaseService<DfCheckingProblemV2M
                     .filter(StringUtils::isNotBlank)
                     .ifPresent(status -> queryWrapper.like(DfCheckingProblemV2::getStatus, status));
 
-            Optional.ofNullable(data.getStartDate())
-                    .ifPresent(startDate -> queryWrapper.ge(DfCheckingProblemV2::getStartDate, startDate));
-
-            Optional.ofNullable(data.getEndDate())
-                    .ifPresent(endDate -> queryWrapper.le(DfCheckingProblemV2::getEndDate, endDate));
+            if (!Objects.isNull(data.getStartDate())) {
+                queryWrapper.ge(DfCheckingProblemV2::getStartDate, data.getStartDate());
+            }
 
+            if (!Objects.isNull(data.getEndDate())) {
+                queryWrapper.le(DfCheckingProblemV2::getEndDate, data.getEndDate());
+            }
             Optional.ofNullable(data.getProblemLevel())
                     .filter(StringUtils::isNotBlank)
                     .ifPresent(problemLevel -> queryWrapper.le(DfCheckingProblemV2::getProblemLevel, problemLevel));
diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/service/DfCheckingRecordV2Service.java b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfCheckingRecordV2Service.java
index 980a58dd..5364dd7b 100644
--- a/shuili-system/src/main/java/com/kms/yxgh/df/service/DfCheckingRecordV2Service.java
+++ b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfCheckingRecordV2Service.java
@@ -80,7 +80,7 @@ public class DfCheckingRecordV2Service extends BaseService<DfCheckingRecordV2Map
             }
 
             if (!Objects.isNull(data.getEndDate())) {
-                queryWrapper.le(DfCheckingRecord::getStartDate, data.getEndDate());
+                queryWrapper.le(DfCheckingRecord::getEndDate, data.getEndDate());
             }
         }
 
diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/service/DfYhV2Service.java b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfYhV2Service.java
index 60933f60..9e8179f3 100644
--- a/shuili-system/src/main/java/com/kms/yxgh/df/service/DfYhV2Service.java
+++ b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfYhV2Service.java
@@ -16,6 +16,7 @@ import com.kms.yxgh.common.dto.DocV2Dto;
 import com.kms.yxgh.common.enums.DfYhV2StatusEnum;
 import com.kms.yxgh.common.service.ApprovalService;
 import com.kms.yxgh.common.service.DefaultApprovalBusinessService;
+import com.kms.yxgh.df.domain.DfCheckingProblemV2;
 import com.kms.yxgh.df.domain.DfYhV2;
 import com.kms.yxgh.df.dto.v2.DfRecordSearchV2Dto;
 import com.kms.yxgh.df.dto.v2.DfYhApproveDto;
@@ -72,11 +73,13 @@ public class DfYhV2Service extends DefaultApprovalBusinessService<DfYhV2Mapper,
                     .filter(StringUtils::isNotBlank)
                     .ifPresent(status -> queryWrapper.like(DfYhV2::getStatus, status));
 
-            Optional.ofNullable(data.getStartDate())
-                    .ifPresent(startDate -> queryWrapper.ge(DfYhV2::getStartDate, startDate));
+            if (!Objects.isNull(data.getStartDate())) {
+                queryWrapper.ge(DfYhV2::getStartDate, data.getStartDate());
+            }
 
-            Optional.ofNullable(data.getEndDate())
-                    .ifPresent(endDate -> queryWrapper.ge(DfYhV2::getEndDate, endDate));
+            if (!Objects.isNull(data.getEndDate())) {
+                queryWrapper.le(DfYhV2::getEndDate, data.getEndDate());
+            }
 
             Optional.ofNullable(data.getProblemLevel())
                     .filter(StringUtils::isNotBlank)