diff --git a/src/main/java/com/interplug/qcast/biz/estimate/EstimateService.java b/src/main/java/com/interplug/qcast/biz/estimate/EstimateService.java index 04a3df7b..ad0de059 100644 --- a/src/main/java/com/interplug/qcast/biz/estimate/EstimateService.java +++ b/src/main/java/com/interplug/qcast/biz/estimate/EstimateService.java @@ -1619,6 +1619,13 @@ public class EstimateService { if (estimateRequest.getSchDrawingFlg().indexOf("4") < 0) { } + if ("EXCEL2".equals(estimateRequest.getSchDownload())) { + workbook.removeSheetAt(workbook.getSheetIndex("特異事項")); + workbook.removeSheetAt(workbook.getSheetIndex("発電シミュレーション")); + workbook.removeSheetAt(workbook.getSheetIndex("割付図・系統図")); + workbook.removeSheetAt(workbook.getSheetIndex("架台図")); + } + ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream(); workbook.write(byteArrayOutputStream); excelBytes = byteArrayOutputStream.toByteArray(); diff --git a/src/main/resources/template/excel/excel_download_quotation_detail_template.xlsx b/src/main/resources/template/excel/excel_download_quotation_detail_template.xlsx index eb6f624c..21077232 100644 Binary files a/src/main/resources/template/excel/excel_download_quotation_detail_template.xlsx and b/src/main/resources/template/excel/excel_download_quotation_detail_template.xlsx differ diff --git a/src/main/resources/template/excel/excel_download_quotation_detail_template.xlsx_ver0 b/src/main/resources/template/excel/excel_download_quotation_detail_template.xlsx_ver0 deleted file mode 100644 index a34e4b42..00000000 Binary files a/src/main/resources/template/excel/excel_download_quotation_detail_template.xlsx_ver0 and /dev/null differ diff --git a/src/main/resources/template/pdf/pdf_download_quotation_detail_template.html b/src/main/resources/template/pdf/pdf_download_quotation_detail_template.html index 4adb5770..55f27175 100644 --- a/src/main/resources/template/pdf/pdf_download_quotation_detail_template.html +++ b/src/main/resources/template/pdf/pdf_download_quotation_detail_template.html @@ -755,9 +755,9 @@