From 7d13a600309bbca84656f5af06e4306269e73a37 Mon Sep 17 00:00:00 2001 From: hxh Date: Tue, 11 Mar 2025 18:54:25 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E9=97=AE=E9=A2=98=E6=B8=85=E5=8D=95?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E9=99=90=E5=88=B6=E7=8A=B6=E6=80=81=EF=BC=8C?= =?UTF-8?q?=E6=8F=90=E4=BA=A4=E5=90=8E=E7=9A=84=E6=89=8D=E8=83=BD=E5=B1=95?= =?UTF-8?q?=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/kms/yxgh/df/service/DfCheckingProblemV2Service.java | 5 +++-- 1 file changed, 3 insertions(+), 2 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 15546809..a04601d5 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 @@ -19,6 +19,8 @@ import java.util.List; import java.util.Optional; import java.util.stream.Collectors; +import static com.kms.yxgh.common.enums.DfYhV2StatusEnum.DURING_INSPECTION; + /** * 项目管理记录 * @@ -59,11 +61,9 @@ public class DfCheckingProblemV2Service extends BaseService queryWrapper.like(DfCheckingProblemV2::getStatus, status)); Optional.ofNullable(data.getStartDate()) - .filter(startDate -> startDate != null) .ifPresent(startDate -> queryWrapper.ge(DfCheckingProblemV2::getStartDate, startDate)); Optional.ofNullable(data.getEndDate()) - .filter(endDate -> endDate != null) .ifPresent(endDate -> queryWrapper.le(DfCheckingProblemV2::getEndDate, endDate)); Optional.ofNullable(data.getProblemLevel()) @@ -75,6 +75,7 @@ public class DfCheckingProblemV2Service extends BaseService queryWrapper.eq(DfCheckingProblemV2::getProblemLevel, recordId)); } + queryWrapper.ne(DfCheckingProblemV2::getStatus, DURING_INSPECTION.getValue()); // 查询分页数据 Page queryPage = page(page, queryWrapper);