From 8cbfe16422ef6833e1e7734cf5f86e0661351037 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?qkr7828=28=EB=B0=95=EC=9E=AC=EC=9A=B0=29?= <박재우@DESKTOP-EF7ECBO> Date: Thu, 22 Sep 2022 12:03:56 +0900 Subject: [PATCH] =?UTF-8?q?=EB=B9=84=ED=96=89=20=EA=B3=84=ED=9A=8D=20?= =?UTF-8?q?=EC=8A=B9=EC=9D=B8=20-=20=EA=B2=80=EC=83=89=EC=A1=B0=EA=B1=B4?= =?UTF-8?q?=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../biz/jpa/repository/flt/FltPlanQueryRepository.java | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/palnet/biz/jpa/repository/flt/FltPlanQueryRepository.java b/src/main/java/com/palnet/biz/jpa/repository/flt/FltPlanQueryRepository.java index 3db59aa..825dee5 100644 --- a/src/main/java/com/palnet/biz/jpa/repository/flt/FltPlanQueryRepository.java +++ b/src/main/java/com/palnet/biz/jpa/repository/flt/FltPlanQueryRepository.java @@ -298,12 +298,9 @@ public class FltPlanQueryRepository { builder.and(bas.groupId.in(rq.getGroupId())); builder.and(bas.cstmrSno.eq(rq.getCstmrSno())); } - if (rq.getSchFltEndDt() != null) { - builder.and(bas.schFltStDt.goe(rq.getSchFltStDt())); - } - if (rq.getSchFltStDt() != null) { - builder.and(bas.schFltEndDt.loe(rq.getSchFltEndDt())); - } + builder.and(bas.schFltStDt.goe(rq.getSchFltStDt())); + builder.and(bas.schFltStDt.before(rq.getSchFltEndDt())); + if (rq.getAprvlYn() != null && !"A".equals(rq.getAprvlYn())) { builder.and(bas.aprvlYn.eq(rq.getAprvlYn())); }