From d9e762094552e67b0be24399665740580de3a848 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?lkd9125=28=EC=9D=B4=EA=B2=BD=EB=8F=84=29?= Date: Thu, 27 Jun 2024 15:28:45 +0900 Subject: [PATCH] =?UTF-8?q?fix:=20=EB=93=9C=EB=A1=A0=EC=9B=90=EC=8A=A4?= =?UTF-8?q?=ED=83=91=20=EB=B9=84=ED=96=89=EC=8A=B9=EC=9D=B8=20Excel,=20PDF?= =?UTF-8?q?=20=EB=8B=A4=EC=9A=B4=EB=A1=9C=EB=93=9C=20=EC=8B=A0=EC=B2=AD?= =?UTF-8?q?=EA=B3=A0=EB=8F=84=20=EC=BB=AC=EB=9F=BC=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/bas/dos/service/BasDosService.java | 41 ++++++++++++------- .../templates/laanc/valid_document.html | 4 +- 2 files changed, 29 insertions(+), 16 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 8c18fc3b..9d63cc91 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 @@ -324,12 +324,13 @@ public class BasDosService { sheet.setColumnWidth(3, cellWidth53); sheet.setColumnWidth(4, cellWidth53); sheet.setColumnWidth(5, cellWidth113); - sheet.setColumnWidth(6, cellWidth53); + sheet.setColumnWidth(6, cellWidth70); sheet.setColumnWidth(7, cellWidth70); - sheet.setColumnWidth(8, cellWidth174); - sheet.setColumnWidth(9, cellWidth73); - sheet.setColumnWidth(10, cellWidth82); - sheet.setColumnWidth(11, cellWidth145); + sheet.setColumnWidth(8, cellWidth70); + sheet.setColumnWidth(9, cellWidth174); + sheet.setColumnWidth(10, cellWidth73); + sheet.setColumnWidth(11, cellWidth82); + sheet.setColumnWidth(12, cellWidth145); Row row = null; Cell cell = null; @@ -348,7 +349,7 @@ public class BasDosService { cell = row.createCell(0); cell.setCellValue("월"); cell.setCellStyle(firstHeaderStyle); - cell = row.createCell(11); + cell = row.createCell(12); cell.setCellValue("비고"); cell.setCellStyle(lastHeaderStyle); @@ -368,18 +369,21 @@ public class BasDosService { cell.setCellValue("상세주소"); cell.setCellStyle(headerStyle); cell = row.createCell(6); - cell.setCellValue("비행반경"); + cell.setCellValue("비행반경(m)"); cell.setCellStyle(headerStyle); cell = row.createCell(7); - cell.setCellValue("최고비행\n해발고도(m)"); + cell.setCellValue("신청고도(m)"); cell.setCellStyle(headerStyle); cell = row.createCell(8); - cell.setCellValue("세부사항"); + cell.setCellValue("최고비행\n해발고도(m)"); cell.setCellStyle(headerStyle); cell = row.createCell(9); - cell.setCellValue("비행목적"); + cell.setCellValue("세부사항"); cell.setCellStyle(headerStyle); cell = row.createCell(10); + cell.setCellValue("비행목적"); + cell.setCellStyle(headerStyle); + cell = row.createCell(11); cell.setCellValue("긴급구조기관"); cell.setCellStyle(headerStyle); @@ -416,9 +420,12 @@ public class BasDosService { cell.setCellValue(area.getAddr3() != null ? area.getAddr3() : ""); cell.setCellStyle(bodyStyle); cell = row.createCell(6); - cell.setCellValue(area.getFltElev() != null ? area.getFltElev() + "" : ""); + cell.setCellValue(area.getBufferZone()); cell.setCellStyle(bodyStyle); cell = row.createCell(7); + cell.setCellValue(area.getFltElev() != null ? area.getFltElev() + "" : ""); + cell.setCellStyle(bodyStyle); + cell = row.createCell(8); cell.setCellValue( area.getFltElevMax() != null ? area.getFltElevMax() != 0D @@ -431,16 +438,16 @@ public class BasDosService { cell.setCellStyle(bodyStyle); } - cell = row.createCell(8); + cell = row.createCell(9); cell.setCellValue(area.getDtl() != null ? area.getDtl() : ""); cell.setCellStyle(bodyStyle); - cell = row.createCell(9); + cell = row.createCell(10); cell.setCellValue(plan.getPurpose() != null ? plan.getPurpose() : ""); cell.setCellStyle(bodyStyle); - cell = row.createCell(10); + cell = row.createCell(11); cell.setCellValue(area.getEra() != null ? area.getEra() : ""); cell.setCellStyle(bodyStyle); - cell = row.createCell(11); + cell = row.createCell(12); cell.setCellValue(area.getRm() != null ? area.getRm() : ""); cell.setCellStyle(lastBodyStyle); } @@ -472,11 +479,15 @@ public class BasDosService { for (BasDosPlanRs basDosPlanRs : rs) { for (BasDosPlanAreaRs area : basDosPlanRs.getAreaList()) { + + Double fltElevMax = area.getFltElevMax(); + ValidPdfModel.ValidFlighgModel node = new ValidPdfModel.ValidFlighgModel(); node.setApplyNm(basDosPlanRs.getApplyNm()); node.setAddr1(area.getAddr1()); node.setAddr2(area.getAddr2()); node.setAddr3(area.getAddr3()); + node.setBufferZone(area.getBufferZone()); node.setFltElev(area.getFltElev()); node.setFltElevMax(area.getFltElevMax() != null ? area.getFltElevMax() != 0D 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 c96b4f3d..84fa5323 100644 --- a/pav-server/src/main/resources/templates/laanc/valid_document.html +++ b/pav-server/src/main/resources/templates/laanc/valid_document.html @@ -9,7 +9,7 @@ font-family: 'malgun gothic' } table th.header{ - border:1px solid #777;background:#e0eed1;padding:4px;text-align:center;vertical-align:middle;font-size:15px;height:40px;font-weight: bold; + border:1px solid #777;background:#e0eed1;padding:4px;text-align:center;vertical-align:middle;font-size:13px;height:40px;font-weight: bold; } table td.body{ border:1px solid #777;background:#fff;padding:4px;text-align:center;vertical-align:middle;font-size:14px;height:45px; @@ -40,6 +40,7 @@ 행정구역2 상세주소 반경
(m) + 신청고도
(m) 최고비행
해발고도(m) 비고 @@ -52,6 +53,7 @@ +