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

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;
+
 }

src/main/java/com/palnet/biz/api/bas/flight/service/BasFlightService.java

@@ -51,7 +51,7 @@ public class BasFlightService {
                 List<BasFlightPlanAreaModel> area = new ArrayList<>();
                 for (FltPlanArea areaEntity : areaEntityList) {
                     BasFlightPlanAreaModel areaModel = BasFlightMapper.mapper.entityToModel(areaEntity);
-                    List<FltPlanAreaCoord> coordEntityList = fltPlanAreaCoordRepository.findFirstByPlanAreaSnoOrderByPlanAreaCoordSnoAsc(areaEntity.getPlanAreaSno());
+                    List<FltPlanAreaCoord> coordEntityList = fltPlanAreaCoordRepository.findByPlanAreaSnoOrderByPlanAreaCoordSnoAsc(areaEntity.getPlanAreaSno());
                     if (coordEntityList != null && !coordEntityList.isEmpty()) {
                         areaModel.setCoordList(BasFlightMapper.mapper.entityToModelCoordList(coordEntityList));
                     }
@@ -165,7 +165,7 @@ public class BasFlightService {
                     List<BasFlightPlanAreaCoordModel> coordsModelList = areaModel.getCoordList();
                     if (coordsModelList != null && !coordsModelList.isEmpty()) {
                         Integer areaSno = areaModel.getPlanAreaSno();
-                        List<FltPlanAreaCoord> coordEntityList = fltPlanAreaCoordRepository.findFirstByPlanAreaSnoOrderByPlanAreaCoordSnoAsc(areaSno);
+                        List<FltPlanAreaCoord> coordEntityList = fltPlanAreaCoordRepository.findByPlanAreaSnoOrderByPlanAreaCoordSnoAsc(areaSno);
                         for (BasFlightPlanAreaCoordModel coordModel : coordsModelList) {
                             FltPlanAreaCoord coordEntity = coordEntityList.stream().filter(fltPlanAreaCoord -> fltPlanAreaCoord.getPlanAreaCoordSno() == coordModel.getPlanAreaCoordSno()).findFirst().orElse(null);
                             if (coordEntity == null) {

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<FltPlanAreaCoord, Integer> {
-    List<FltPlanAreaCoord> findFirstByPlanAreaSnoOrderByPlanAreaCoordSnoAsc(Integer planAreaSno);
+    List<FltPlanAreaCoord> findByPlanAreaSnoOrderByPlanAreaCoordSnoAsc(Integer planAreaSno);
 }

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()));
         }