From 158c0ab6e7c996061a84e729791a4b9c0e855634 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?scnoh=28=EB=85=B8=EC=8A=B9=EC=B2=A0=29?= Date: Fri, 29 Jul 2022 10:12:02 +0900 Subject: [PATCH 1/2] =?UTF-8?q?=EB=B9=84=ED=96=89=20=EA=B3=84=ED=9A=8D=20?= =?UTF-8?q?=EC=A2=8C=ED=91=9C=20=EB=8D=B0=EC=9D=B4=ED=84=B0=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../palnet/biz/api/bas/flight/service/BasFlightService.java | 4 ++-- .../biz/jpa/repository/flt/FltPlanAreaCoordRepository.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/palnet/biz/api/bas/flight/service/BasFlightService.java b/src/main/java/com/palnet/biz/api/bas/flight/service/BasFlightService.java index ebe0ba9..79bb417 100644 --- a/src/main/java/com/palnet/biz/api/bas/flight/service/BasFlightService.java +++ b/src/main/java/com/palnet/biz/api/bas/flight/service/BasFlightService.java @@ -51,7 +51,7 @@ public class BasFlightService { List area = new ArrayList<>(); for (FltPlanArea areaEntity : areaEntityList) { BasFlightPlanAreaModel areaModel = BasFlightMapper.mapper.entityToModel(areaEntity); - List coordEntityList = fltPlanAreaCoordRepository.findFirstByPlanAreaSnoOrderByPlanAreaCoordSnoAsc(areaEntity.getPlanAreaSno()); + List coordEntityList = fltPlanAreaCoordRepository.findByPlanAreaSnoOrderByPlanAreaCoordSnoAsc(areaEntity.getPlanAreaSno()); if (coordEntityList != null && !coordEntityList.isEmpty()) { areaModel.setCoordList(BasFlightMapper.mapper.entityToModelCoordList(coordEntityList)); } @@ -165,7 +165,7 @@ public class BasFlightService { List coordsModelList = areaModel.getCoordList(); if (coordsModelList != null && !coordsModelList.isEmpty()) { Integer areaSno = areaModel.getPlanAreaSno(); - List coordEntityList = fltPlanAreaCoordRepository.findFirstByPlanAreaSnoOrderByPlanAreaCoordSnoAsc(areaSno); + List coordEntityList = fltPlanAreaCoordRepository.findByPlanAreaSnoOrderByPlanAreaCoordSnoAsc(areaSno); for (BasFlightPlanAreaCoordModel coordModel : coordsModelList) { FltPlanAreaCoord coordEntity = coordEntityList.stream().filter(fltPlanAreaCoord -> fltPlanAreaCoord.getPlanAreaCoordSno() == coordModel.getPlanAreaCoordSno()).findFirst().orElse(null); if (coordEntity == null) { diff --git a/src/main/java/com/palnet/biz/jpa/repository/flt/FltPlanAreaCoordRepository.java b/src/main/java/com/palnet/biz/jpa/repository/flt/FltPlanAreaCoordRepository.java index deb5888..3b2a628 100644 --- a/src/main/java/com/palnet/biz/jpa/repository/flt/FltPlanAreaCoordRepository.java +++ b/src/main/java/com/palnet/biz/jpa/repository/flt/FltPlanAreaCoordRepository.java @@ -8,5 +8,5 @@ import java.util.List; import java.util.Optional; public interface FltPlanAreaCoordRepository extends JpaRepository { - List findFirstByPlanAreaSnoOrderByPlanAreaCoordSnoAsc(Integer planAreaSno); + List findByPlanAreaSnoOrderByPlanAreaCoordSnoAsc(Integer planAreaSno); } From f97dfa2e95b3129b4d8c7f635973edf91025bd12 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?scnoh=28=EB=85=B8=EC=8A=B9=EC=B2=A0=29?= Date: Fri, 29 Jul 2022 20:08:29 +0900 Subject: [PATCH 2/2] =?UTF-8?q?=EB=B9=84=ED=96=89=EA=B3=84=ED=9A=8D=20?= =?UTF-8?q?=EA=B7=B8=EB=A3=B9=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../biz/api/bas/flight/model/BasFlightPlanListRq.java | 4 ++++ .../biz/jpa/repository/flt/FltPlanQueryRepository.java | 9 +++++++++ 2 files changed, 13 insertions(+) diff --git a/src/main/java/com/palnet/biz/api/bas/flight/model/BasFlightPlanListRq.java b/src/main/java/com/palnet/biz/api/bas/flight/model/BasFlightPlanListRq.java index b5aeea8..255a6d0 100644 --- a/src/main/java/com/palnet/biz/api/bas/flight/model/BasFlightPlanListRq.java +++ b/src/main/java/com/palnet/biz/api/bas/flight/model/BasFlightPlanListRq.java @@ -6,7 +6,11 @@ import java.util.Date; @Data public class BasFlightPlanListRq { + + private String groupId; + private Integer cstmrSno; private Date schFltStDt; private Date schFltEndDt; private String aprvlYn; + } 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 40b9234..e3e7396 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 @@ -28,6 +28,15 @@ public class FltPlanQueryRepository { QFltPlanArea area = QFltPlanArea.fltPlanArea; BooleanBuilder builder = new BooleanBuilder(); + + if (rq.getGroupId() != null) { + builder.and(bas.groupId.eq(rq.getGroupId())); + } + + if (rq.getCstmrSno() != null) { + builder.and(bas.cstmrSno.eq(rq.getCstmrSno())); + } + if (rq.getSchFltEndDt() != null) { builder.and(bas.schFltStDt.loe(rq.getSchFltEndDt())); }