|
|
|
@ -646,23 +646,41 @@ public class FltPlanQueryRepository {
|
|
|
|
|
QFltPlanBas fltPlanBas = QFltPlanBas.fltPlanBas; |
|
|
|
|
QFltPlanArcrft fltPlanArcrft = QFltPlanArcrft.fltPlanArcrft; |
|
|
|
|
|
|
|
|
|
BooleanBuilder parameter = new BooleanBuilder(); |
|
|
|
|
|
|
|
|
|
DateTemplate<Instant> flightStartDate = Expressions.dateTemplate( |
|
|
|
|
Instant.class, "DATE({0})", fltPlanBas.schFltStDt); |
|
|
|
|
|
|
|
|
|
DateTemplate<Instant> flightEndDate = Expressions.dateTemplate( |
|
|
|
|
Instant.class, "DATE({0})", fltPlanBas.schFltEndDt); |
|
|
|
|
// DateTemplate<Instant> flightStartDate = Expressions.dateTemplate(
|
|
|
|
|
// Instant.class, "DATE({0})", fltPlanBas.schFltStDt);
|
|
|
|
|
|
|
|
|
|
// DateTemplate<Instant> 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<FltPlanBas> 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; |
|
|
|
|