비행운항 스케줄 목록 작업 - 비행 시작 주소, 종료 주소 추가

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

@@ -369,17 +369,19 @@ public class FltPlanQueryRepository {
         QFltPlanBas fltPlanBas = QFltPlanBas.fltPlanBas;
         QFltPlanArcrft fltPlanArcrft = QFltPlanArcrft.fltPlanArcrft;
         QCtrCntrlBas cntrlBas = QCtrCntrlBas.ctrCntrlBas;
-
         QPtyGroupBas groupBas = QPtyGroupBas.ptyGroupBas;
+        QCtrCntrlHstryArea cntrlHstryArea = QCtrCntrlHstryArea.ctrCntrlHstryArea;
 
         BooleanBuilder builder = new BooleanBuilder();
 
-        DateTemplate<Date> startDate = Expressions.dateTemplate(
-                Date.class,
-                "DATE({0})",
-                fltPlanBas.schFltStDt);
+        DateTemplate<Date> flightStartDate = Expressions.dateTemplate(
+                Date.class,"DATE({0})", fltPlanBas.schFltStDt);
+
+        DateTemplate<Date> flightEndDate = Expressions.dateTemplate(
+                Date.class,"DATE({0})", fltPlanBas.schFltEndDt);
 
-        builder.and(startDate.eq(DateUtils.stringToDate(searchDate)))
+        builder.and(flightStartDate.loe(DateUtils.stringToDate(searchDate)))
+                .and(flightEndDate.goe(DateUtils.stringToDate(searchDate)))
                 .and(fltPlanBas.aprvlYn.eq("Y"));
 
         List<BasFlightScheduleRs> querys = query.select(
@@ -394,6 +396,32 @@ public class FltPlanQueryRepository {
                                 fltPlanBas.memberName,
                                 fltPlanArcrft.ownerNm,
                                 fltPlanArcrft.idntfNum,
+                                ExpressionUtils.as(
+                                        JPAExpressions.select(
+                                                cntrlHstryArea.area1.concat(" ")
+                                                    .concat(cntrlHstryArea.area2).concat(" ")
+                                                    .concat(cntrlHstryArea.area3).concat(" ")
+                                                    .concat(cntrlHstryArea.landNm).concat(" ")
+                                                    .concat(cntrlHstryArea.landNum)
+                                        )
+                                            .from(cntrlHstryArea)
+                                            .where(cntrlHstryArea.cntrlId.eq(cntrlBas.cntrlId)
+                                                    .and(cntrlHstryArea.actnType.eq("01"))),
+                                        "startAddress"
+                                ),
+                                ExpressionUtils.as(
+                                        JPAExpressions.select(
+                                                    cntrlHstryArea.area1.concat(" ")
+                                                        .concat(cntrlHstryArea.area2).concat(" ")
+                                                        .concat(cntrlHstryArea.area3).concat(" ")
+                                                        .concat(cntrlHstryArea.landNm).concat(" ")
+                                                        .concat(cntrlHstryArea.landNum)
+                                                )
+                                                .from(cntrlHstryArea)
+                                                .where(cntrlHstryArea.cntrlId.eq(cntrlBas.cntrlId)
+                                                    .and(cntrlHstryArea.actnType.eq("99"))),
+                                        "endAddress"
+                                ),
                                 fltPlanBas.schFltStDt,
                                 fltPlanBas.schFltEndDt,
                                 cntrlBas.cntrlId,