.

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<MainDashFlightListModel> 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("비행 중")
-    		            .when(ccb.statusCd.eq("99")).then("비행 완료")
-    		            .when(fpb.planSno.isNotNull()).then("비행 대기 중")
+			            .when(ccb.statusCd.eq("01")).then("inFlight")
+			            .when(ccb.statusCd.eq("99")).then("flightComplete")
+			            .when(fpb.planSno.isNotNull()).then("flightWaiting")
     		            .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<Tuple> res = query
     		    .select(