From 679ca7d467be550700d400f1af67ec41a5c2e03f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?lkd9125=28=EC=9D=B4=EA=B2=BD=EB=8F=84=29?= Date: Wed, 29 Nov 2023 15:13:31 +0900 Subject: [PATCH] =?UTF-8?q?=EB=B9=84=ED=96=89=EC=8A=B9=EC=9D=B8=20?= =?UTF-8?q?=EC=97=B0=EC=82=B0=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../flt/FltPlanQueryRepository.java | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/pav-server/src/main/java/com/palnet/biz/jpa/repository/flt/FltPlanQueryRepository.java b/pav-server/src/main/java/com/palnet/biz/jpa/repository/flt/FltPlanQueryRepository.java index ece0af1b..d5aa708c 100644 --- a/pav-server/src/main/java/com/palnet/biz/jpa/repository/flt/FltPlanQueryRepository.java +++ b/pav-server/src/main/java/com/palnet/biz/jpa/repository/flt/FltPlanQueryRepository.java @@ -1424,7 +1424,7 @@ public class FltPlanQueryRepository { * 비행승인 많은 기체 데이터, top 1 * @return */ - public FlightStcsValueModel getFltPlanAprvnStaticStcs(boolean authCheck, String groupId){ + public FlightStcsValueModel getFltPlanAprvnStaticStcs(boolean authCheck, String serviceType){ FlightStcsValueModel result = new FlightStcsValueModel(); QFltPlanArcrft qFltPlanArcrft = QFltPlanArcrft.fltPlanArcrft; @@ -1432,7 +1432,7 @@ public class FltPlanQueryRepository { BooleanBuilder builder = new BooleanBuilder(); builder.and(qFltPlanBas.aprvlYn.eq("Y")); - if(groupId != null && !(groupId.equals(""))) builder.and(qFltPlanBas.groupId.eq(groupId)); + if(serviceType != null && !(serviceType.equals(""))) builder.and(qFltPlanBas.serviceType.eq(serviceType)); if(authCheck) builder.and(qFltPlanBas.cstmrSno.eq(jwtTokenUtil.getCstmrSnoByToken())); @@ -1456,9 +1456,9 @@ public class FltPlanQueryRepository { if(result.getName().equals("")) result.setName(" "); String idntfNum = result.getName(); - result.setYear(getFltPlanAprvnYear(idntfNum, authCheck, groupId)); - result.setMonth(getFltPlanAprvnMonth(idntfNum, authCheck, groupId)); - result.setDay(getFltPlanAprvnDay(idntfNum, authCheck, groupId)); + result.setYear(getFltPlanAprvnYear(idntfNum, authCheck, serviceType)); + result.setMonth(getFltPlanAprvnMonth(idntfNum, authCheck, serviceType)); + result.setDay(getFltPlanAprvnDay(idntfNum, authCheck, serviceType)); } else { FlightStcsValueModel node = new FlightStcsValueModel(); @@ -1473,14 +1473,14 @@ public class FltPlanQueryRepository { return result; } - private Long getFltPlanAprvnDay(String idntfNum, boolean authCheck, String groupId){ + private Long getFltPlanAprvnDay(String idntfNum, boolean authCheck, String serviceType){ QFltPlanArcrft qFltPlanArcrft = QFltPlanArcrft.fltPlanArcrft; QFltPlanBas qFltPlanBas = QFltPlanBas.fltPlanBas; String dateFormat = "%Y-%m-%d"; BooleanBuilder builder = new BooleanBuilder(); - if(groupId != null && !(groupId.equals(""))) builder.and(qFltPlanBas.groupId.eq(groupId)); + if(serviceType != null && !(serviceType.equals(""))) builder.and(qFltPlanBas.serviceType.eq(serviceType)); if(authCheck) builder.and(qFltPlanBas.cstmrSno.eq(jwtTokenUtil.getCstmrSnoByToken())); builder.and(qFltPlanArcrft.idntfNum.eq(idntfNum)); builder.and(qFltPlanBas.aprvlYn.eq("Y")); @@ -1498,7 +1498,7 @@ public class FltPlanQueryRepository { .fetchOne(); } - private Long getFltPlanAprvnMonth(String idntfNum, boolean authCheck, String groupId){ + private Long getFltPlanAprvnMonth(String idntfNum, boolean authCheck, String serviceType){ QFltPlanArcrft qFltPlanArcrft = QFltPlanArcrft.fltPlanArcrft; QFltPlanBas qFltPlanBas = QFltPlanBas.fltPlanBas; @@ -1508,7 +1508,7 @@ public class FltPlanQueryRepository { builder.and(qFltPlanBas.aprvlYn.eq("Y")); builder.and(qFltPlanBas.createDt.goe(LocalDate.now().minusMonths(1).atStartOfDay().atZone(ZoneId.of("Asia/Seoul")).toInstant())); builder.and(qFltPlanBas.createDt.loe(LocalDate.now().atStartOfDay().atZone(ZoneId.of("Asia/Seoul")).toInstant())); - if(groupId != null && !(groupId.equals(""))) builder.and(qFltPlanBas.groupId.eq(groupId)); + if(serviceType != null && !(serviceType.equals(""))) builder.and(qFltPlanBas.serviceType.eq(serviceType)); if(authCheck) builder.and(qFltPlanBas.cstmrSno.eq(jwtTokenUtil.getCstmrSnoByToken())); return query @@ -1522,7 +1522,7 @@ public class FltPlanQueryRepository { .fetchOne(); } - private Long getFltPlanAprvnYear(String idntfNum, boolean authCheck, String groupId){ + private Long getFltPlanAprvnYear(String idntfNum, boolean authCheck, String serviceType){ QFltPlanArcrft qFltPlanArcrft = QFltPlanArcrft.fltPlanArcrft; QFltPlanBas qFltPlanBas = QFltPlanBas.fltPlanBas; @@ -1531,7 +1531,7 @@ public class FltPlanQueryRepository { builder.and(qFltPlanBas.aprvlYn.eq("Y")); builder.and(qFltPlanBas.createDt.goe(LocalDate.now().minusYears(1).atStartOfDay().atZone(ZoneId.of("Asia/Seoul")).toInstant())); builder.and(qFltPlanBas.createDt.loe(LocalDate.now().atStartOfDay().atZone(ZoneId.of("Asia/Seoul")).toInstant())); - if(groupId != null && !(groupId.equals(""))) builder.and(qFltPlanBas.groupId.eq(groupId)); + if(serviceType != null && !(serviceType.equals(""))) builder.and(qFltPlanBas.serviceType.eq(serviceType)); if(authCheck) builder.and(qFltPlanBas.cstmrSno.eq(jwtTokenUtil.getCstmrSnoByToken())); return query