From f8558654b63af3b23f6b88f3cc79233ee55b0b08 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EB=B0=95=EC=9E=AC=EC=9A=B0?=
 <박재우@host.docker.internal>
Date: Thu, 16 Nov 2023 17:36:17 +0900
Subject: [PATCH] =?UTF-8?q?=EA=B8=B0=EC=A4=80=20=EC=88=98=EC=A0=95(?=
 =?UTF-8?q?=EC=98=A4=EB=8A=98=20=EB=82=A0=EB=A0=B8=EA=B1=B0=EB=82=98,=20?=
 =?UTF-8?q?=EC=98=A4=EB=8A=98=20=EB=B9=84=ED=96=89=EA=B3=84=ED=9A=8D?=
 =?UTF-8?q?=EC=84=9C=20=EB=93=B1=EB=A1=9D=ED=95=9C=20=EA=B1=B4=EB=A7=8C=20?=
 =?UTF-8?q?=ED=91=9C=EC=B6=9C=EB=90=98=EB=8F=84=EB=A1=9D)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../biz/jpa/repository/flt/FltPlanQueryRepository.java      | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pav-server/src/main/java/com/palnet/biz/jpa/repository/flt/FltPlanQueryRepository.java b/pav-server/src/main/java/com/palnet/biz/jpa/repository/flt/FltPlanQueryRepository.java
index 31b8c666..4749b00f 100644
--- a/pav-server/src/main/java/com/palnet/biz/jpa/repository/flt/FltPlanQueryRepository.java
+++ b/pav-server/src/main/java/com/palnet/biz/jpa/repository/flt/FltPlanQueryRepository.java
@@ -1950,7 +1950,8 @@ public class FltPlanQueryRepository {
 
     	builder.and(
     	        ccb.cntrlStDt.between(startOfToday, startOfTomorrow)
-    	        .or(fpb.schFltStDt.loe(now).and(fpb.schFltEndDt.goe(now)))
+    	        .or(fpb.schFltStDt.between(startOfToday, startOfTomorrow)
+    	        		.and(fpb.schFltEndDt.between(startOfToday, startOfTomorrow)))
     	    )
     	    .and(fpb.planSno.isNotNull());
     	
@@ -2009,7 +2010,8 @@ public class FltPlanQueryRepository {
 
     	builder.and(
     	        ccb.cntrlStDt.between(startOfToday, startOfTomorrow)
-    	        .or(fpb.schFltStDt.loe(now).and(fpb.schFltEndDt.goe(now)))
+    	        .or(fpb.schFltStDt.between(startOfToday, startOfTomorrow)
+    	        		.and(fpb.schFltEndDt.between(startOfToday, startOfTomorrow)))
     	    )
     	    .and(fpb.planSno.isNotNull());