|
|
@ -1950,7 +1950,8 @@ public class FltPlanQueryRepository { |
|
|
|
|
|
|
|
|
|
|
|
builder.and( |
|
|
|
builder.and( |
|
|
|
ccb.cntrlStDt.between(startOfToday, startOfTomorrow) |
|
|
|
ccb.cntrlStDt.between(startOfToday, startOfTomorrow) |
|
|
|
.or(fpb.schFltStDt.loe(now).and(fpb.schFltEndDt.goe(now))) |
|
|
|
.or(fpb.schFltStDt.between(startOfToday, startOfTomorrow) |
|
|
|
|
|
|
|
.and(fpb.schFltEndDt.between(startOfToday, startOfTomorrow))) |
|
|
|
) |
|
|
|
) |
|
|
|
.and(fpb.planSno.isNotNull()); |
|
|
|
.and(fpb.planSno.isNotNull()); |
|
|
|
|
|
|
|
|
|
|
@ -2009,7 +2010,8 @@ public class FltPlanQueryRepository { |
|
|
|
|
|
|
|
|
|
|
|
builder.and( |
|
|
|
builder.and( |
|
|
|
ccb.cntrlStDt.between(startOfToday, startOfTomorrow) |
|
|
|
ccb.cntrlStDt.between(startOfToday, startOfTomorrow) |
|
|
|
.or(fpb.schFltStDt.loe(now).and(fpb.schFltEndDt.goe(now))) |
|
|
|
.or(fpb.schFltStDt.between(startOfToday, startOfTomorrow) |
|
|
|
|
|
|
|
.and(fpb.schFltEndDt.between(startOfToday, startOfTomorrow))) |
|
|
|
) |
|
|
|
) |
|
|
|
.and(fpb.planSno.isNotNull()); |
|
|
|
.and(fpb.planSno.isNotNull()); |
|
|
|
|
|
|
|
|
|
|
|