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