Browse Source

fix: 드론원스탑 비행승인 Excel, PDF 다운로드 신청고도컬럼 추가 내역 롤백

feature/address-coordinate
lkd9125(이경도) 3 months ago
parent
commit
152190849b
  1. 31
      pav-server/src/main/java/com/palnet/biz/api/bas/dos/service/BasDosService.java
  2. 2
      pav-server/src/main/resources/templates/laanc/valid_document.html

31
pav-server/src/main/java/com/palnet/biz/api/bas/dos/service/BasDosService.java

@ -326,11 +326,10 @@ public class BasDosService {
sheet.setColumnWidth(5, cellWidth113);
sheet.setColumnWidth(6, cellWidth70);
sheet.setColumnWidth(7, cellWidth70);
sheet.setColumnWidth(8, cellWidth70);
sheet.setColumnWidth(9, cellWidth174);
sheet.setColumnWidth(10, cellWidth73);
sheet.setColumnWidth(11, cellWidth82);
sheet.setColumnWidth(12, cellWidth145);
sheet.setColumnWidth(8, cellWidth174);
sheet.setColumnWidth(9, cellWidth73);
sheet.setColumnWidth(10, cellWidth82);
sheet.setColumnWidth(11, cellWidth145);
Row row = null;
Cell cell = null;
@ -349,7 +348,7 @@ public class BasDosService {
cell = row.createCell(0);
cell.setCellValue("월");
cell.setCellStyle(firstHeaderStyle);
cell = row.createCell(12);
cell = row.createCell(11);
cell.setCellValue("비고");
cell.setCellStyle(lastHeaderStyle);
@ -372,18 +371,15 @@ public class BasDosService {
cell.setCellValue("비행반경(m)");
cell.setCellStyle(headerStyle);
cell = row.createCell(7);
cell.setCellValue("신청고도(m)");
cell.setCellStyle(headerStyle);
cell = row.createCell(8);
cell.setCellValue("최고비행\n해발고도(m)");
cell.setCellStyle(headerStyle);
cell = row.createCell(9);
cell = row.createCell(8);
cell.setCellValue("세부사항");
cell.setCellStyle(headerStyle);
cell = row.createCell(10);
cell = row.createCell(9);
cell.setCellValue("비행목적");
cell.setCellStyle(headerStyle);
cell = row.createCell(11);
cell = row.createCell(10);
cell.setCellValue("긴급구조기관");
cell.setCellStyle(headerStyle);
@ -423,9 +419,6 @@ public class BasDosService {
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
@ -438,16 +431,16 @@ public class BasDosService {
cell.setCellStyle(bodyStyle);
}
cell = row.createCell(9);
cell = row.createCell(8);
cell.setCellValue(area.getDtl() != null ? area.getDtl() : "");
cell.setCellStyle(bodyStyle);
cell = row.createCell(10);
cell = row.createCell(9);
cell.setCellValue(plan.getPurpose() != null ? plan.getPurpose() : "");
cell.setCellStyle(bodyStyle);
cell = row.createCell(11);
cell = row.createCell(10);
cell.setCellValue(area.getEra() != null ? area.getEra() : "");
cell.setCellStyle(bodyStyle);
cell = row.createCell(12);
cell = row.createCell(11);
cell.setCellValue(area.getRm() != null ? area.getRm() : "");
cell.setCellStyle(lastBodyStyle);
}

2
pav-server/src/main/resources/templates/laanc/valid_document.html

@ -40,7 +40,6 @@
<th class="header">행정구역2</th>
<th class="header">상세주소</th>
<th class="header">반경<br>(m)</th>
<th class="header">신청고도<br>(m)</th>
<th class="header">최고비행<br>해발고도(m)</th>
<th class="header">비고</th>
</tr>
@ -54,7 +53,6 @@
<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.bufferZone}"></span></td>
<td class="body"><span th:text="${data.fltElev}"></span></td>
<!-- data.approvalCd가 'F'일 경우 -->
<th:block th:if="${#strings.equals(data.approvalCd, 'F')}">

Loading…
Cancel
Save