From a5c23f648035f956ea74461d9c3453da723e6ed6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?scnoh=28=EB=85=B8=EC=8A=B9=EC=B2=A0=29?= Date: Tue, 4 Oct 2022 11:43:31 +0900 Subject: [PATCH] =?UTF-8?q?=EB=B9=84=ED=96=89=EC=9A=B4=ED=95=AD=20?= =?UTF-8?q?=EC=8A=A4=EC=BC=80=EC=A4=84=20=EB=AA=A9=EB=A1=9D=20=EC=9E=91?= =?UTF-8?q?=EC=97=85=20-=20=EB=B9=84=ED=96=89=20=EC=8B=9C=EC=9E=91=20?= =?UTF-8?q?=EC=A3=BC=EC=86=8C,=20=EC=A2=85=EB=A3=8C=20=EC=A3=BC=EC=86=8C?= =?UTF-8?q?=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../flt/FltPlanQueryRepository.java | 40 ++++++++++++++++--- 1 file changed, 34 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/palnet/biz/jpa/repository/flt/FltPlanQueryRepository.java b/src/main/java/com/palnet/biz/jpa/repository/flt/FltPlanQueryRepository.java index 56d5bcd..f17af07 100644 --- a/src/main/java/com/palnet/biz/jpa/repository/flt/FltPlanQueryRepository.java +++ b/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 startDate = Expressions.dateTemplate( - Date.class, - "DATE({0})", - fltPlanBas.schFltStDt); + DateTemplate flightStartDate = Expressions.dateTemplate( + Date.class,"DATE({0})", fltPlanBas.schFltStDt); + + DateTemplate 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 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,