diff --git a/pav-server/src/main/java/com/palnet/biz/api/bas/dos/service/BasDosService.java b/pav-server/src/main/java/com/palnet/biz/api/bas/dos/service/BasDosService.java index 6ead5688..edb04739 100644 --- a/pav-server/src/main/java/com/palnet/biz/api/bas/dos/service/BasDosService.java +++ b/pav-server/src/main/java/com/palnet/biz/api/bas/dos/service/BasDosService.java @@ -158,7 +158,7 @@ public class BasDosService { if (cptAuthCode != null) { Coordinate centerPoint = new Coordinate(area.getLon(), area.getLat()); if ("DF0002".equals(cptAuthCode)) { - // 검토신청한 건에 대해서 + // TODO 검토신청한 건에 대해만 보이도록 // 관제과(9.3km) AirspaceUtils airspaceUtils = AirspaceUtils.getInstance(); List airspaces = airspaceUtils.getAirspaces(AirspaceUtils.AirspaceType.GIMPO); @@ -260,7 +260,7 @@ public class BasDosService { .addr1(addr1) .addr2(addr2) .addr3(addr3) - .approvalCd(approvalCd.getCode()) + .approvalCd(approvalCd != null ? approvalCd.getCode() : null) .fltElevMax(fltElevMax) .reqElev(area.getReqElev()) .dtl(area.getDtl()) diff --git a/pav-server/src/main/java/com/palnet/biz/jpa/entity/type/ReviewedType.java b/pav-server/src/main/java/com/palnet/biz/jpa/entity/type/ReviewedType.java index 63e74c3e..348040c5 100644 --- a/pav-server/src/main/java/com/palnet/biz/jpa/entity/type/ReviewedType.java +++ b/pav-server/src/main/java/com/palnet/biz/jpa/entity/type/ReviewedType.java @@ -5,10 +5,12 @@ import com.fasterxml.jackson.annotation.JsonValue; import lombok.Getter; public enum ReviewedType { - REVIEWED("R", "검토완료"), - WAIT("W", "검토대기"), - UNNECESSARY("U", "검토불필요"), - REVIEW_AGAIN("A", "재검토"); + REVIEWED("R", "검토완료"), // 검토완료 - 김포공항기준(운항과, 관제과) + WAIT("W", "검토대기"), // 최초 - 대상지역 + UNNECESSARY("U", "검토불필요"), // 최초 - 비대상지역 + REQUEST("Q", "검토요청"), // 검토요청 - 김포공항기준(운항과 > 관제과) + REQUEST_AGAIN("A", "검토재요청"), // 검토재요청 - 김포공항기준(관제과 > 운항과) + REQUEST_CANCEL("C", "검토요청취소"); // 검토요청취소 - 김포공항기준(관제과 > 운항과) private final String code; @Getter