From ad52e484b4d60647819ea3531b270febf758648c Mon Sep 17 00:00:00 2001 From: ysCha Date: Thu, 31 Jul 2025 13:21:15 +0900 Subject: [PATCH] =?UTF-8?q?[1219]=20=EA=B2=AC=EC=A0=81=EC=84=9C=20PDF?= =?UTF-8?q?=EC=97=90=20=EB=B0=A9=EC=9C=84=EA=B0=81=EB=8F=84=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../qcast/biz/estimate/EstimateService.java | 22 ++++++++++++++ ...df_download_quotation_detail_template.html | 29 +++++++++++++++++-- 2 files changed, 49 insertions(+), 2 deletions(-) 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 fa7aca9c..9105676b 100644 --- a/src/main/java/com/interplug/qcast/biz/estimate/EstimateService.java +++ b/src/main/java/com/interplug/qcast/biz/estimate/EstimateService.java @@ -2183,6 +2183,9 @@ public class EstimateService { elm = doc.getElementById("standardWindSpeedName4"); elm.text(StringUtils.defaultString(data.getStandardWindSpeedName())); +// elm = doc.getElementById("deg1"); +// elm.text(StringUtils.defaultString(data.getRoofInfo().getCompasDeg())+"°"); + // 도면(가대제외 이미지) if (data.getDrawingImg1() != null) { elm = doc.getElementById("drawingImg1"); @@ -2190,6 +2193,16 @@ public class EstimateService { elm.html(""); } + if (data.getRoofInfo().getCompasDegImg() != null) { + elm = doc.getElementById("degImg1"); + String imgSrc1 = Base64.getEncoder().encodeToString(data.getRoofInfo().getCompasDegImg()); + elm.html( + "
"+ StringUtils.defaultString(data.getRoofInfo().getCompasDeg()) + "°
"); + } + + int no = 1; sb = new StringBuilder(); for (ItemResponse itemResponse : list) { @@ -2297,6 +2310,15 @@ public class EstimateService { elm.html(""); } + if (data.getRoofInfo().getCompasDegImg() != null) { + elm = doc.getElementById("degImg2"); + String imgSrc2 = Base64.getEncoder().encodeToString(data.getRoofInfo().getCompasDegImg()); + elm.html( + "
"+ StringUtils.defaultString(data.getRoofInfo().getCompasDeg()) + "°
"); + } + no = 1; sb = new StringBuilder(); for (ItemResponse itemResponse : list) { 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 d96e776a..b5e8498b 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 @@ -67,15 +67,24 @@ /* 가이드박스 */ .guide-box { + position: relative; border: 1px solid #000; padding: 15px; - margin: 10px 0 + margin: 10px 0; + display: flex; + align-items: flex-start; + } + + .guide-image { + margin-right: 15px; + flex-shrink: 0; } .guide-content { white-space: pre-line; line-height: 1.4; - font-size: 14px + font-size: 14px; + flex: 1; } /* 차트퍼블 */ @@ -345,7 +354,17 @@ padding: 30px 0; border: 1px solid #000; } + .guide-image{ + position: absolute; + top: 20px; + left: 20px; + width: 50px; + } + .guide-img-tit{ + text-align: center; + font-size: 8px; + } @@ -663,7 +682,11 @@
+
+
+
+
@@ -774,6 +797,8 @@
+
+