|
|
@ -1949,9 +1949,8 @@ public class FltPlanQueryRepository { |
|
|
|
Instant startOfTomorrow = currentDate.plusDays(1).atTime(LocalTime.MIN).atZone(databaseTimeZone).toInstant(); |
|
|
|
Instant startOfTomorrow = currentDate.plusDays(1).atTime(LocalTime.MIN).atZone(databaseTimeZone).toInstant(); |
|
|
|
|
|
|
|
|
|
|
|
builder.and( |
|
|
|
builder.and( |
|
|
|
ccb.cntrlStDt.between(startOfToday, startOfTomorrow) |
|
|
|
ccb.createDt.between(startOfToday, startOfTomorrow) |
|
|
|
.or(fpb.schFltStDt.between(startOfToday, startOfTomorrow) |
|
|
|
.or(fpb.createDt.between(startOfToday, startOfTomorrow)) |
|
|
|
.and(fpb.schFltEndDt.between(startOfToday, startOfTomorrow))) |
|
|
|
|
|
|
|
) |
|
|
|
) |
|
|
|
.and(fpb.planSno.isNotNull()); |
|
|
|
.and(fpb.planSno.isNotNull()); |
|
|
|
|
|
|
|
|
|
|
@ -2009,9 +2008,8 @@ public class FltPlanQueryRepository { |
|
|
|
Instant startOfTomorrow = currentDate.plusDays(1).atTime(LocalTime.MIN).atZone(databaseTimeZone).toInstant(); |
|
|
|
Instant startOfTomorrow = currentDate.plusDays(1).atTime(LocalTime.MIN).atZone(databaseTimeZone).toInstant(); |
|
|
|
|
|
|
|
|
|
|
|
builder.and( |
|
|
|
builder.and( |
|
|
|
ccb.cntrlStDt.between(startOfToday, startOfTomorrow) |
|
|
|
ccb.createDt.between(startOfToday, startOfTomorrow) |
|
|
|
.or(fpb.schFltStDt.between(startOfToday, startOfTomorrow) |
|
|
|
.or(fpb.createDt.between(startOfToday, startOfTomorrow)) |
|
|
|
.and(fpb.schFltEndDt.between(startOfToday, startOfTomorrow))) |
|
|
|
|
|
|
|
) |
|
|
|
) |
|
|
|
.and(fpb.planSno.isNotNull()); |
|
|
|
.and(fpb.planSno.isNotNull()); |
|
|
|
|
|
|
|
|
|
|
|