From fd7759c81d3e8a620325e97a24fead0c83d960c5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?lkd9125=28=EC=9D=B4=EA=B2=BD=EB=8F=84=29?=
 <lkd9125@naver.com>
Date: Wed, 26 Jun 2024 11:27:06 +0900
Subject: [PATCH] =?UTF-8?q?fix:=20PDF=20=EB=8B=A4=EC=9A=B4=EB=A1=9C?=
 =?UTF-8?q?=EB=93=9C=20=ED=8F=B0=ED=8A=B8=20approvalCd=20=EA=B0=92?=
 =?UTF-8?q?=EC=9D=B4=20F=20=EC=9D=BC=EA=B2=BD=EC=9A=B0=20=ED=95=B4?=
 =?UTF-8?q?=EB=B0=9C=EA=B3=A0=EB=8F=84,=20=EB=B9=84=EA=B3=A0=20=EC=BB=AC?=
 =?UTF-8?q?=EB=9F=BC=EC=9D=B4=20=EB=B6=89=EC=9D=80=EC=83=89=EC=83=81?=
 =?UTF-8?q?=EC=9C=BC=EB=A1=9C=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../biz/api/bas/dos/service/BasDosService.java     |  3 ++-
 .../biz/api/comn/file/model/ValidPdfModel.java     |  4 +++-
 .../resources/templates/laanc/valid_document.html  | 14 ++++++++++++--
 3 files changed, 17 insertions(+), 4 deletions(-)

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 92b38fde..599e4f5f 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
@@ -475,8 +475,9 @@ public class BasDosService {
                 node.setAddr2(area.getAddr2());
                 node.setAddr3(area.getAddr3());
                 node.setFltElev(area.getFltElev());
-                node.setFltElevMax(area.getFltElevMax());
+                node.setFltElevMax(area.getFltElevMax() != null ? area.getFltElevMax() + "" : "불가");
                 node.setRm(area.getRm());
+                node.setApprovalCd(area.getApprovalCd());
 
                 validFlightList.add(node);
             }
diff --git a/pav-server/src/main/java/com/palnet/biz/api/comn/file/model/ValidPdfModel.java b/pav-server/src/main/java/com/palnet/biz/api/comn/file/model/ValidPdfModel.java
index 11599a60..a1ffc0b4 100644
--- a/pav-server/src/main/java/com/palnet/biz/api/comn/file/model/ValidPdfModel.java
+++ b/pav-server/src/main/java/com/palnet/biz/api/comn/file/model/ValidPdfModel.java
@@ -58,8 +58,10 @@ public class ValidPdfModel extends PdfBaseModel{
         private String addr3; // 상세주소
         private Double bufferZone; // 반경
         private Double fltElev; // 고도
-        private Double fltElevMax; // 최고비행 해발고도
+        private String fltElevMax; // 최고비행 해발고도
         private String rm; // 비고
+        private String approvalCd; // 승인코드
+
     }
 
 }
diff --git a/pav-server/src/main/resources/templates/laanc/valid_document.html b/pav-server/src/main/resources/templates/laanc/valid_document.html
index 39017c68..c96b4f3d 100644
--- a/pav-server/src/main/resources/templates/laanc/valid_document.html
+++ b/pav-server/src/main/resources/templates/laanc/valid_document.html
@@ -53,8 +53,18 @@
                         <td class="body"><span th:text="${data.addr2}"></span></td>
                         <td class="body"><span th:text="${data.addr3}"></span></td>
                         <td class="body"><span th:text="${data.fltElev}"></span></td>
-                        <td class="body"><span th:text="${data.fltElevMax}"></span></td>
-                        <td class="body"><span th:text="${data.rm}"></span></td>
+
+                        <!-- data.approvalCd가 'F'일 경우 -->
+                        <th:block th:if="${#strings.equals(data.approvalCd, 'F')}">
+                            <td class="body"><span th:style="'color: red;'" th:text="${data.fltElevMax}"></span></td>
+                            <td class="body"><span th:style="'color: red;'" th:text="${data.rm}"></span></td>
+                        </th:block>
+
+                        <!-- data.approvalCd가 'F'가 아닐 경우 -->
+                        <th:block th:unless="${#strings.equals(data.approvalCd, 'F')}">
+                            <td class="body"><span th:text="${data.fltElevMax}"></span></td>
+                            <td class="body"><span th:text="${data.rm}"></span></td>
+                        </th:block>
                     </tr>
                 </th:block>
             </tbody>