조건 변경

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<MainDashFlightListModel> 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<Tuple> 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()
     		            ))