From 9dcb7115f703679485d35bc76de2b81afa178012 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 11:18:56 +0900
Subject: [PATCH] =?UTF-8?q?=EB=B9=84=ED=96=89=20=EA=B3=84=ED=9A=8D=20?=
 =?UTF-8?q?=EB=AA=A9=EB=A1=9D=20-=20=EA=B2=80=EC=83=89=20=EC=A1=B0?=
 =?UTF-8?q?=EA=B1=B4=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../jpa/repository/flt/FltPlanQueryRepository.java    | 11 +++++------
 1 file changed, 5 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 48c6256..3db59aa 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
@@ -2,6 +2,7 @@ package com.palnet.biz.jpa.repository.flt;
 
 import com.palnet.biz.api.bas.flight.model.*;
 import com.palnet.biz.jpa.entity.*;
+import com.palnet.comn.utils.DateUtils;
 import com.querydsl.core.BooleanBuilder;
 import com.querydsl.core.group.GroupBy;
 import com.querydsl.core.types.Predicate;
@@ -12,6 +13,7 @@ import lombok.extern.log4j.Log4j2;
 
 import org.springframework.stereotype.Repository;
 
+
 import java.util.List;
 
 @Log4j2
@@ -41,12 +43,9 @@ public class FltPlanQueryRepository {
         	}
         }
 
-        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 ("Y".equals(rq.getAprvlYn()) || "N".equals(rq.getAprvlYn())) {
 //            builder.and(bas.aprvlYn.eq(rq.getAprvlYn()));
 //        }