Instant 타입 변경

pav-server/src/main/java/com/palnet/biz/jpa/repository/flt/FltPlanQueryRepository.java

@@ -646,23 +646,41 @@ public class FltPlanQueryRepository {
         QFltPlanBas fltPlanBas = QFltPlanBas.fltPlanBas;
         QFltPlanArcrft fltPlanArcrft = QFltPlanArcrft.fltPlanArcrft;
 
-        BooleanBuilder parameter = new BooleanBuilder();
+        
 
-        DateTemplate<Instant> flightStartDate = Expressions.dateTemplate(
+        // DateTemplate<Instant> flightStartDate = Expressions.dateTemplate(
-                Instant.class, "DATE({0})", fltPlanBas.schFltStDt);
+        //         Instant.class, "DATE({0})", fltPlanBas.schFltStDt);
 
-        DateTemplate<Instant> flightEndDate = Expressions.dateTemplate(
+        // DateTemplate<Instant> flightEndDate = Expressions.dateTemplate(
-                Instant.class, "DATE({0})", fltPlanBas.schFltEndDt);
+        //         Instant.class, "DATE({0})", fltPlanBas.schFltEndDt);
+
+
+        Instant svdt = DateUtils.stringToDatetime(serverReceiveDate);
+        serverReceiveDate = InstantUtils.toDateString(svdt);
 
-        parameter.and(flightStartDate.loe(DateUtils.stringToDatetime(serverReceiveDate)))
+        BooleanExpression dateExpression = 
-                .and(flightEndDate.goe(DateUtils.stringToDatetime(serverReceiveDate)))
+                Expressions.stringTemplate("DATE_FORMAT({0}, {1})", fltPlanBas.schFltStDt, "%Y-%m-%d")
+                .loe(serverReceiveDate);
+
+        BooleanExpression dateExpression1 = 
+                Expressions.stringTemplate("DATE_FORMAT({0}, {1})", fltPlanBas.schFltEndDt, "%Y-%m-%d")
+                .goe(serverReceiveDate);
+        
+        BooleanBuilder builder = new BooleanBuilder();
+
+        builder.and(dateExpression)
+                .and(dateExpression1)
                 .and(fltPlanArcrft.idntfNum.eq(idntfNum));
 
+        // builder.and(flightStartDate.loe(DateUtils.stringToDatetime(serverReceiveDate)))
+        //         .and(flightEndDate.goe(DateUtils.stringToDatetime(serverReceiveDate)))
+        //         .and(fltPlanArcrft.idntfNum.eq(idntfNum));
+
         List<FltPlanBas> result = query.select(fltPlanBas)
                 .from(fltPlanBas)
                 .leftJoin(fltPlanArcrft)
-                .on(fltPlanBas.planSno.eq(fltPlanArcrft.planSno))
+                        .on(fltPlanBas.planSno.eq(fltPlanArcrft.planSno))
-                .where(parameter)
+                .where(builder)
                 .fetch();
 
         return result;

pav-server/src/main/java/com/palnet/biz/scheduler/ctr/service/CtrSchedulerService.java

@@ -23,7 +23,6 @@ import com.palnet.biz.jpa.repository.ctr.CtrCntrlQueryRepository;
 import com.palnet.biz.jpa.service.ctr.CtrCntrlJpaService;
 import com.palnet.biz.scheduler.ctr.model.CtrTrnsLctnModel;
 import com.palnet.comn.utils.DateUtils;
-import com.palnet.comn.utils.InstantUtils;
 
 @Service
 @RequiredArgsConstructor
@@ -56,7 +55,6 @@ public class CtrSchedulerService {
 				long diffMinute = DateUtils.diffMinute(history.getSrvrRcvDt(), Instant.now());
 
 				if(diffMinute > GP_END_TIME) {
-					
 					ctrCntrlBasRepository.updateCntrlEndType("01", Instant.now(), "99", history.getCntrlId());
 
 					/* 종료지점 주소 저장 */