fixbug:堤防

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())
+            if (!Objects.isNull(data.getStartDate())) {
-                    .ifPresent(startDate -> queryWrapper.ge(DfCheckingProblemV2::getStartDate, startDate));
+                queryWrapper.ge(DfCheckingProblemV2::getStartDate, data.getStartDate());
-
+            }
-            Optional.ofNullable(data.getEndDate())
-                    .ifPresent(endDate -> queryWrapper.le(DfCheckingProblemV2::getEndDate, endDate));
 
+            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));

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());
             }
         }
 

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())
+            if (!Objects.isNull(data.getStartDate())) {
-                    .ifPresent(startDate -> queryWrapper.ge(DfYhV2::getStartDate, startDate));
+                queryWrapper.ge(DfYhV2::getStartDate, data.getStartDate());
+            }
 
-            Optional.ofNullable(data.getEndDate())
+            if (!Objects.isNull(data.getEndDate())) {
-                    .ifPresent(endDate -> queryWrapper.ge(DfYhV2::getEndDate, endDate));
+                queryWrapper.le(DfYhV2::getEndDate, data.getEndDate());
+            }
 
             Optional.ofNullable(data.getProblemLevel())
                     .filter(StringUtils::isNotBlank)