From 19bfc069087fa576440aad3e1f8295fa293a67c2 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 14:02:10 +0900 Subject: [PATCH] =?UTF-8?q?=EC=A1=B0=EA=B1=B4=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jpa/repository/flt/FltPlanQueryRepository.java | 14 ++++---------- 1 file changed, 4 insertions(+), 10 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 dfdaf6d8..61a3b0b5 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 @@ -1942,9 +1942,6 @@ public class FltPlanQueryRepository { } Instant now = Instant.now(); - Instant todayStart = LocalDate.now().atStartOfDay().toInstant(ZoneOffset.UTC); - Instant todayEnd = LocalDate.now().plusDays(1).atStartOfDay().toInstant(ZoneOffset.UTC); - List result = query .select(Projections.bean(MainDashFlightListModel.class, pgb.groupNm, @@ -1971,11 +1968,11 @@ public class FltPlanQueryRepository { .leftJoin(ccb).on(ccb.cntrlId.eq(fpccr.cntrlId)) .where( builder - .and(fpb.schFltStDt.between( + .and(ccb.cntrlStDt.between( now.atZone(ZoneId.of("Asia/Seoul")).truncatedTo(ChronoUnit.DAYS).toInstant(), now.atZone(ZoneId.of("Asia/Seoul")).truncatedTo(ChronoUnit.DAYS).plus(1, ChronoUnit.DAYS).toInstant() )) - .and(fpb.schFltEndDt.between( + .and(ccb.cntrlEndDt.between( now.atZone(ZoneId.of("Asia/Seoul")).truncatedTo(ChronoUnit.DAYS).toInstant(), now.atZone(ZoneId.of("Asia/Seoul")).truncatedTo(ChronoUnit.DAYS).plus(1, ChronoUnit.DAYS).toInstant() )) @@ -2003,9 +2000,6 @@ public class FltPlanQueryRepository { } Instant now = Instant.now(); - Instant todayStart = LocalDate.now().atStartOfDay().toInstant(ZoneOffset.UTC); - Instant todayEnd = LocalDate.now().plusDays(1).atStartOfDay().toInstant(ZoneOffset.UTC); - List res = query .select( new CaseBuilder() @@ -2023,11 +2017,11 @@ public class FltPlanQueryRepository { .leftJoin(ccb).on(ccb.cntrlId.eq(fpccr.cntrlId)) .where( builder - .and(fpb.schFltStDt.between( + .and(ccb.cntrlStDt.between( now.atZone(ZoneId.of("Asia/Seoul")).truncatedTo(ChronoUnit.DAYS).toInstant(), now.atZone(ZoneId.of("Asia/Seoul")).truncatedTo(ChronoUnit.DAYS).plus(1, ChronoUnit.DAYS).toInstant() )) - .and(fpb.schFltEndDt.between( + .and(ccb.cntrlEndDt.between( now.atZone(ZoneId.of("Asia/Seoul")).truncatedTo(ChronoUnit.DAYS).toInstant(), now.atZone(ZoneId.of("Asia/Seoul")).truncatedTo(ChronoUnit.DAYS).plus(1, ChronoUnit.DAYS).toInstant() ))