Merge branch 'master' of http://gitea.palntour.com/pav/pav-server

src/main/java/com/palnet/biz/jpa/repository/flt/FltPlanQueryRepository.java

@@ -438,6 +438,8 @@ public class FltPlanQueryRepository {
                 .on(fltPlanBas.planSno.eq(fltPlanArcrft.planSno))
                 .leftJoin(cntrlBas)
                 .on(fltPlanArcrft.idntfNum.eq(cntrlBas.idntfNum))
+                .on(cntrlBas.cntrlStDt.loe(fltPlanBas.schFltStDt))
+                .on(cntrlBas.cntrlEndDt.goe(fltPlanBas.schFltEndDt))
                 .where(builder)
                 .fetch();