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

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

Browse Source 
Reviewed-on: #270
This commit is contained in:
ysCha 2025-12-18 14:01:50 +09:00
commit 6f0d043603
4 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
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) { if (estimateRequest.getSchDrawingFlg().indexOf("1") < 0) {
safeRemoveSheet(workbook, "見積書"); safeRemoveSheet(workbook, "見積書");
safeRemoveSheet(workbook, "特異事項"); // safeRemoveSheet(workbook, "特異事項");
} }
@ -1833,7 +1833,7 @@ public class EstimateService {
if ("EXCEL2".equals(estimateRequest.getSchDownload())) { if ("EXCEL2".equals(estimateRequest.getSchDownload())) {
safeRemoveSheet(workbook, "見積書"); safeRemoveSheet(workbook, "見積書");
safeRemoveSheet(workbook, "特異事項"); // safeRemoveSheet(workbook, "特異事項");
safeRemoveSheet(workbook, "発電シミュレーション"); safeRemoveSheet(workbook, "発電シミュレーション");
safeRemoveSheet(workbook, "割付図・系統図"); safeRemoveSheet(workbook, "割付図・系統図");
safeRemoveSheet(workbook, "架台図"); safeRemoveSheet(workbook, "架台図");

BIN
src/main/resources/template/excel/excel_download_quotation_detail_template.xlsx
View File

Binary file not shown.

BIN
src/main/resources/template/excel/excel_download_simulation_detail_template.xlsx
View File

Binary file not shown.

24
src/main/resources/template/pdf/pdf_download_quotation_detail_template.html
View File

@ -543,18 +543,18 @@
</tbody> </tbody>
</table> </table>
</div> </div>
<div class="section2"> <!--<div class="section2">-->
<table class="mb20"> <!-- <table class="mb20">-->
<thead> <!-- <thead>-->
<tr> <!-- <tr>-->
<th style="width:20%;">項目</th> <!-- <th style="width:20%;">項目</th>-->
<th>文言</th> <!-- <th>文言</th>-->
</tr> <!-- </tr>-->
</thead> <!-- </thead>-->
<tbody id="noteList_detail"> <!-- <tbody id="noteList_detail">-->
</tbody> <!-- </tbody>-->
</table> <!-- </table>-->
</div> <!--</div>-->
<div class="section3"> <div class="section3">
<table class="mb20"> <table class="mb20">
<tbody> <tbody>