qcast3/qcast-api
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request '특이사항 제거 ,excel, pdf' (#274) from dev into dev-deploy

Browse Source 
Reviewed-on: #274
This commit is contained in:
ysCha 2025-12-22 11:24:20 +09:00
commit cb18e2196a
1 changed files with 19 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/main/java/com/interplug/qcast/biz/estimate/EstimateService.java
View File

@ -1810,7 +1810,7 @@ public class EstimateService {
if (estimateRequest.getSchDrawingFlg().indexOf("1") < 0) {
safeRemoveSheet(workbook, "見積書");
// safeRemoveSheet(workbook, "特異事項");
safeRemoveSheet(workbook, "特異事項");
}
@ -1824,22 +1824,26 @@ public class EstimateService {
safeRemoveSheet(workbook, "架台図");
}
safeRemoveSheet(workbook, "特異事項");
}
// 추후 개발 (가대중량표)
if (estimateRequest.getSchDrawingFlg().indexOf("4") < 0) {
safeRemoveSheet(workbook, "重量算");
safeRemoveSheet(workbook, "特異事項");
}
if ("EXCEL2".equals(estimateRequest.getSchDownload())) {
safeRemoveSheet(workbook, "見積書");
// safeRemoveSheet(workbook, "特異事項");
safeRemoveSheet(workbook, "特異事項");
safeRemoveSheet(workbook, "発電シミュレーション");
safeRemoveSheet(workbook, "割付図・系統図");
safeRemoveSheet(workbook, "架台図");
safeRemoveSheet(workbook, "重量算");
}else{
safeRemoveSheet(workbook,"見積書.");
safeRemoveSheet(workbook, "特異事項");
}
ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
@ -2159,19 +2163,19 @@ public class EstimateService {
}
// 견적서 특이사항 목록 설정
if (data.getNoteList() != null) {
sb = new StringBuilder();
for (NoteResponse noteResponse : data.getNoteList()) {
sb.append("<tr>");
sb.append("<td style='text-align:left;'>"
+ StringUtils.defaultString(noteResponse.getCodeNm()) + "</td>");
sb.append("<td style='text-align:left;'>" + StringUtils
.defaultString(noteResponse.getRemarks()).replaceAll("\r\n|\r|\n", "<br />") + "</td>");
sb.append("</tr>");
}
elm = doc.getElementById("noteList_detail");
elm.append(sb.toString());
}
// if (data.getNoteList() != null) {
// sb = new StringBuilder();
// for (NoteResponse noteResponse : data.getNoteList()) {
// sb.append("<tr>");
// sb.append("<td style='text-align:left;'>"
// + StringUtils.defaultString(noteResponse.getCodeNm()) + "</td>");
// sb.append("<td style='text-align:left;'>" + StringUtils
// .defaultString(noteResponse.getRemarks()).replaceAll("\r\n|\r|\n", "<br />") + "</td>");
// sb.append("</tr>");
// }
// elm = doc.getElementById("noteList_detail");
// elm.append(sb.toString());
// }
// 도면 설정
elm = doc.getElementById("objectNo4");