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 85320e7c..3de29103 100644 --- a/src/main/java/com/interplug/qcast/biz/estimate/EstimateService.java +++ b/src/main/java/com/interplug/qcast/biz/estimate/EstimateService.java @@ -1571,13 +1571,7 @@ public class EstimateService { estimateResponse.setDrawingImg1(drawingImg1); } log.debug("url1 ::: {}", url); -// File file = new File(drawingDirPath + File.separator + baseDrawingImgName + "_1.png"); -// if (file.exists()) { -// InputStream imageInputStream = -// new FileInputStream(drawingDirPath + File.separator + baseDrawingImgName + "_1.png"); -// byte[] drawingImg1 = Util.toByteArray(imageInputStream); -// estimateResponse.setDrawingImg1(drawingImg1); -// } + String baseDrawingImgName2 = estimateRequest.getObjectNo() + "_" + estimateRequest.getPlanNo(); URL url2 = new URL(drawingDirPath + File.separator + baseDrawingImgName2 + "_2.png"); URLConnection con2 = url2.openConnection(); @@ -1589,13 +1583,7 @@ public class EstimateService { estimateResponse.setDrawingImg2(drawingImg2); } log.debug("url2 ::: {}", url2); -// file = new File(drawingDirPath + File.separator + baseDrawingImgName + "_2.png"); -// if (file.exists()) { -// InputStream imageInputStream2 = -// new FileInputStream(drawingDirPath + File.separator + baseDrawingImgName + "_2.png"); -// byte[] drawingImg2 = Util.toByteArray(imageInputStream2); -// estimateResponse.setDrawingImg2(drawingImg2); -// } + //userId 에 따른 영업점 주소, 전화, fax 정보 조회 if(estimateRequest.getSaleStoreId() != null && "T01".equals(estimateRequest.getSaleStoreId())){ @@ -1658,10 +1646,10 @@ public class EstimateService { String userId = estimateRequest.getUserId(); String storeLvl = estimateRequest.getStoreLvl(); - String saleStoreId = estimateRequest.getSaleStoreId(); + String createStoreId = estimateRequest.getCreateStoreId(); if(storeLvl != null && storeLvl.equals("2")){ - if(!Objects.equals(Objects.requireNonNull(saleStoreId), userId)) - templateFilePath = "pdf_download_quotation_detail_template2.html"; + if(!Objects.equals(createStoreId, userId)) + templateFilePath = "pdf_download_quotation_detail_template2.html"; } // 템플릿 html 조회 @@ -1709,15 +1697,17 @@ public class EstimateService { Workbook workbook = null; String excelTemplateNam = "excel_download_quotation_detail_template.xlsx"; + String userId = estimateRequest.getUserId(); String storeLvl = estimateRequest.getStoreLvl(); - String saleStoreId = estimateRequest.getSaleStoreId(); + String createStoreId = estimateRequest.getCreateStoreId(); if(storeLvl != null && storeLvl.equals("2")){ - if(!Objects.equals(Objects.requireNonNull(saleStoreId), userId)) + if(!Objects.equals(createStoreId, userId)) excelTemplateNam = "excel_download_quotation_detail_template2.xlsx"; } + // itemGroup이 "STAND_"가 아닌 항목들만 필터링하여 새로운 리스트 생성 List estimateItemList15 = estimateItemList.stream() .filter(item -> !"STAND_".equals(item.getItemGroup())) @@ -2125,13 +2115,15 @@ public class EstimateService { + StringUtils.defaultString(itemResponse.getItemName()) + ""); sb.append("" + StringUtils.defaultString(itemResponse.getItemNo()) + ""); - sb.append("" - + StringUtils.defaultString(itemResponse.getSalePrice()) + ""); + sb.append( + "" + + StringUtils.defaultString(itemResponse.getSalePrice()) + + ""); sb.append("" + StringUtils.defaultString(itemResponse.getAmount()) + ""); sb.append( "" + StringUtils.defaultString(itemResponse.getUnit()) + ""); - sb.append("" + sb.append("" + StringUtils.defaultString(itemResponse.getSaleTotPrice()) + ""); sb.append(""); } diff --git a/src/main/resources/template/pdf/pdf_download_quotation_detail_template2.html b/src/main/resources/template/pdf/pdf_download_quotation_detail_template2.html index 6d8b0486..03c75132 100644 --- a/src/main/resources/template/pdf/pdf_download_quotation_detail_template2.html +++ b/src/main/resources/template/pdf/pdf_download_quotation_detail_template2.html @@ -43,7 +43,7 @@ line-height: 115%; color: #333 } - + .month-table td { word-break: break-all; } @@ -390,6 +390,10 @@ font-size: 8px; } + .hide-column { + display: none; + } + @@ -445,7 +449,7 @@
- FAX : + FAX :
@@ -492,7 +496,7 @@ 価格 - + @@ -513,16 +517,16 @@ 小計 - + 消費税 (10%) - + 合計金額 - + @@ -676,13 +680,13 @@
- + - + @@ -797,7 +801,7 @@ - + @@ -828,13 +832,13 @@
物件番号 作成日
物件名 積雪条件作成日
物件名 積雪条件
- - + + - +
No 部材名 数量
@@ -875,7 +879,7 @@
- +
重量算出シート @@ -901,8 +905,8 @@
- システム重量合計: kg -
+ システム重量合計: kg +