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 @@