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 1a80bc1..d9dcd45 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 @@ -646,23 +646,41 @@ public class FltPlanQueryRepository { QFltPlanBas fltPlanBas = QFltPlanBas.fltPlanBas; QFltPlanArcrft fltPlanArcrft = QFltPlanArcrft.fltPlanArcrft; - BooleanBuilder parameter = new BooleanBuilder(); + - DateTemplate flightStartDate = Expressions.dateTemplate( - Instant.class, "DATE({0})", fltPlanBas.schFltStDt); + // DateTemplate flightStartDate = Expressions.dateTemplate( + // Instant.class, "DATE({0})", fltPlanBas.schFltStDt); - DateTemplate flightEndDate = Expressions.dateTemplate( - Instant.class, "DATE({0})", fltPlanBas.schFltEndDt); + // DateTemplate flightEndDate = Expressions.dateTemplate( + // Instant.class, "DATE({0})", fltPlanBas.schFltEndDt); + + + Instant svdt = DateUtils.stringToDatetime(serverReceiveDate); + serverReceiveDate = InstantUtils.toDateString(svdt); - parameter.and(flightStartDate.loe(DateUtils.stringToDatetime(serverReceiveDate))) - .and(flightEndDate.goe(DateUtils.stringToDatetime(serverReceiveDate))) + BooleanExpression dateExpression = + 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 result = query.select(fltPlanBas) .from(fltPlanBas) .leftJoin(fltPlanArcrft) - .on(fltPlanBas.planSno.eq(fltPlanArcrft.planSno)) - .where(parameter) + .on(fltPlanBas.planSno.eq(fltPlanArcrft.planSno)) + .where(builder) .fetch(); return result; diff --git a/pav-server/src/main/java/com/palnet/biz/scheduler/ctr/service/CtrSchedulerService.java b/pav-server/src/main/java/com/palnet/biz/scheduler/ctr/service/CtrSchedulerService.java index 10f7d1f..d1e7595 100644 --- a/pav-server/src/main/java/com/palnet/biz/scheduler/ctr/service/CtrSchedulerService.java +++ b/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()); /* 종료지점 주소 저장 */