From f5844dd36067af533e89093fa17493b083cac4bb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EB=B0=95=EC=9E=AC=EC=9A=B0?= <박재우@host.docker.internal> Date: Fri, 17 Nov 2023 10:41:52 +0900 Subject: [PATCH] . --- .../flt/FltPlanQueryRepository.java | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 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 18c58531..3fa50410 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 @@ -1948,11 +1948,11 @@ public class FltPlanQueryRepository { Instant startOfToday = currentDate.atTime(LocalTime.MIN).atZone(databaseTimeZone).toInstant(); Instant startOfTomorrow = currentDate.plusDays(1).atTime(LocalTime.MIN).atZone(databaseTimeZone).toInstant(); -// builder.and( -// ccb.createDt.between(startOfToday, startOfTomorrow) -// .or(fpb.createDt.between(startOfToday, startOfTomorrow)) -// ) -// .and(fpb.planSno.isNotNull()); + builder.and( + ccb.createDt.between(startOfToday, startOfTomorrow) + .or(fpb.createDt.between(startOfToday, startOfTomorrow)) + ) + .and(fpb.planSno.isNotNull()); List result = query .select(Projections.bean(MainDashFlightListModel.class, @@ -1967,9 +1967,9 @@ public class FltPlanQueryRepository { ccb.cntrlStDt ).as("totalFlightTime"), new CaseBuilder() - .when(ccb.statusCd.eq("01")).then("inFlight") - .when(ccb.statusCd.eq("99")).then("flightComplete") - .when(fpb.planSno.isNotNull()).then("flightWaiting") + .when(ccb.statusCd.eq("01")).then("비행 중") + .when(ccb.statusCd.eq("99")).then("비행 완료") + .when(fpb.planSno.isNotNull()).then("비행 대기 중") .otherwise("비행 없음").as("status") )) .from(fpa) @@ -2007,11 +2007,11 @@ public class FltPlanQueryRepository { Instant startOfToday = currentDate.atTime(LocalTime.MIN).atZone(databaseTimeZone).toInstant(); Instant startOfTomorrow = currentDate.plusDays(1).atTime(LocalTime.MIN).atZone(databaseTimeZone).toInstant(); -// builder.and( -// ccb.createDt.between(startOfToday, startOfTomorrow) -// .or(fpb.createDt.between(startOfToday, startOfTomorrow)) -// ) -// .and(fpb.planSno.isNotNull()); + builder.and( + ccb.createDt.between(startOfToday, startOfTomorrow) + .or(fpb.createDt.between(startOfToday, startOfTomorrow)) + ) + .and(fpb.planSno.isNotNull()); List res = query .select(