pav
/
pav-be-kac
12
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity
Browse Source

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

feature/address-coordinate
lkd9125(이경도) 3 months ago
parent
e8585288ad
commit
d9e7620945
2 changed files with 29 additions and 16 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 41
      pav-server/src/main/java/com/palnet/biz/api/bas/dos/service/BasDosService.java
  2. 4
      pav-server/src/main/resources/templates/laanc/valid_document.html

41
pav-server/src/main/java/com/palnet/biz/api/bas/dos/service/BasDosService.java
Unescape View File

@ -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

4
pav-server/src/main/resources/templates/laanc/valid_document.html
Unescape View File

@ -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 @@
<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>
@ -52,6 +53,7 @@
<td class="body"><span th:text="${data.addr1}"></span></td>
<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'일 경우 -->

Write Preview
Loading…
Cancel
Save