|
|
@ -438,9 +438,10 @@ public class FltPlanQueryRepository { |
|
|
|
.on(fltPlanBas.planSno.eq(fltPlanArcrft.planSno)) |
|
|
|
.on(fltPlanBas.planSno.eq(fltPlanArcrft.planSno)) |
|
|
|
.leftJoin(cntrlBas) |
|
|
|
.leftJoin(cntrlBas) |
|
|
|
.on(fltPlanArcrft.idntfNum.eq(cntrlBas.idntfNum)) |
|
|
|
.on(fltPlanArcrft.idntfNum.eq(cntrlBas.idntfNum)) |
|
|
|
.on(cntrlBas.cntrlStDt.loe(fltPlanBas.schFltStDt)) |
|
|
|
.on(cntrlBas.cntrlStDt.goe(fltPlanBas.schFltStDt)) |
|
|
|
.on(cntrlBas.cntrlEndDt.goe(fltPlanBas.schFltEndDt)) |
|
|
|
.on(cntrlBas.cntrlStDt.loe(fltPlanBas.schFltEndDt)) |
|
|
|
.where(builder) |
|
|
|
.where(builder) |
|
|
|
|
|
|
|
.orderBy(fltPlanBas.schFltStDt.asc(), cntrlBas.cntrlStDt.asc()) |
|
|
|
.fetch(); |
|
|
|
.fetch(); |
|
|
|
|
|
|
|
|
|
|
|
return querys; |
|
|
|
return querys; |
|
|
|