식별번호 및 항공기기체 생략 가능

pav-server/src/main/java/com/palnet/biz/api/bas/laanc/service/BasLaancService.java

@@ -30,6 +30,7 @@ import org.locationtech.jts.geom.Coordinate;
 import org.locationtech.jts.geom.Geometry;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.StringUtils;
 
 import java.time.Instant;
 import java.util.ArrayList;
@@ -129,6 +130,8 @@ public class BasLaancService {
     // 비행계획서 등록, 약관 등록, 공문 생성
     @Transactional
     public BasLaancLastRs createFlightPlan(BasLaancPlanRq rq) {
+        if (rq == null || rq.getValidatedRs() == null) throw new CustomException(ErrorCode.NON_VALID_PARAMETER);
+
         BasLaancValidatedRs basLaancValidatedRs = rq.getValidatedRs();
 
 //        BasLaancValidatedRs validatedAirspaceRs = this.validationPlanAirspace(rq);
@@ -267,9 +270,13 @@ public class BasLaancService {
             laancPdfModel.setElev(rq.getAreaList().get(0).getFltElev());
         }
         if (rq.getArcrftList() != null && !rq.getArcrftList().isEmpty()) {
+            if (rq.getArcrftList().get(0).getArcrftTypeCd() != null) {
                 laancPdfModel.setArcrftType(rq.getArcrftList().get(0).getArcrftTypeCd().getValue());
+            }
+            if (StringUtils.hasText(rq.getArcrftList().get(0).getIdntfNum())) {
                 laancPdfModel.setIdntfNum(rq.getArcrftList().get(0).getIdntfNum());
             }
+        }
         laancPdfModel.setBirthDate(InstantUtils.toDateString(cstmrInfo.getBrthdyDate()));
 //        laancPdfModel.setSchFltStDt(InstantUtils.toDatetimeString(rq.getSchFltStDt()));
 //        laancPdfModel.setSchFltEndDt(InstantUtils.toDatetimeString(rq.getSchFltEndDt()));

pav-server/src/main/java/com/palnet/comn/code/ErrorCode.java

@@ -3,6 +3,7 @@ package com.palnet.comn.code;
 public enum ErrorCode {
 	SUCCESS("1", "성공"),
 	FAIL("-1" , "실패"),
+	NON_VALID_PARAMETER("VP001", "파라미터가 유효하지 않습니다."),
 	INTERNAL_SERVER_ERROR("ER500", "내부 시스템 오류"),
 	NOT_REGIST_ERROR_CODE("ER501", "등록되지 않은 오류 코드"),
 	DATA_NOTFIND("DT001","데이터 를 찾을수 없습니다."),

pav-server/src/main/resources/templates/laanc/official_document.html

@@ -115,15 +115,16 @@
             <div class="content">비행장치 종류 및 조종자</div>
         </div>
     </div>
-    <div class="line tab3">
+    <div class="line tab3" th:if="${arcrftType} or ${idntfNum}">
         <div class="wrap">
             <div>가)</div>
-            <div class="content">비행기체종류(신고번호): <span th:text="${arcrftType}"/>(<span th:text="${idntfNum}"/>)</div>
+            <div class="content">비행기체종류(신고번호): <span th:if="${arcrftType}" th:text="${arcrftType}"/><span th:unless="${arcrftType}">- </span><span th:if="${idntfNum}">(<span th:text="${idntfNum}"/>)<span></span></div>
         </div>
     </div>
     <div class="line tab3">
         <div class="wrap">
-            <div>나)</div>
+<!--            th:text="'Execution mode is ' + ( (${execMode} == 'dev')? 'Development' : 'Production')"-->
+            <div th:text="(${arcrftType} or ${idntfNum}) ? '나)' : '가)'">나)</div>
             <div class="content">조종자(생년월일): <span th:text="${pilotName}"/>님 (<span th:text="${birthDate}"/>)</div>
         </div>
     </div>