From 9cf28ad5f54ddc195dc01535f402aee94e5a7829 Mon Sep 17 00:00:00 2001
From: "DESKTOP-6ARNG1Q\\dlsgk" <dlsgks29@interplug.co.kr>
Date: Thu, 21 Nov 2024 09:54:20 +0900
Subject: [PATCH] =?UTF-8?q?=EC=97=91=EC=85=80/PDF=20=EB=8B=A4=EC=9A=B4?=
 =?UTF-8?q?=EB=A1=9C=EB=93=9C=EC=8B=9C=20=EA=B5=AC=EB=B6=84=EA=B0=92=20?=
 =?UTF-8?q?=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../qcast/biz/estimate/EstimateService.java   | 53 +++++++++++--------
 .../pwrGnrSimulation/PwrGnrSimService.java    |  3 +-
 2 files changed, 32 insertions(+), 24 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 1483b246..ab4b4de9 100644
--- a/src/main/java/com/interplug/qcast/biz/estimate/EstimateService.java
+++ b/src/main/java/com/interplug/qcast/biz/estimate/EstimateService.java
@@ -9,7 +9,6 @@ import com.interplug.qcast.biz.object.ObjectMapper;
 import com.interplug.qcast.biz.object.dto.ObjectRequest;
 import com.interplug.qcast.biz.object.dto.ObjectResponse;
 import com.interplug.qcast.biz.pwrGnrSimulation.PwrGnrSimService;
-import com.interplug.qcast.biz.pwrGnrSimulation.dto.PwrGnrSimGuideResponse;
 import com.interplug.qcast.biz.pwrGnrSimulation.dto.PwrGnrSimRequest;
 import com.interplug.qcast.biz.pwrGnrSimulation.dto.PwrGnrSimResponse;
 import com.interplug.qcast.config.Exception.ErrorCode;
@@ -938,11 +937,11 @@ public class EstimateService {
       if (pwrGnrSimResponse != null) {
         try {
           // 발전시뮬레이션 안내사항 조회
-          PwrGnrSimGuideResponse pwrGnrSimGuideInfo =
-              pwrGnrSimService.selectPwrGnrSimulationGuideInfo();
-          if (pwrGnrSimGuideInfo != null) {
-            pwrGnrSimResponse.setGuideInfo(pwrGnrSimGuideInfo.getData());
-          }
+          //          PwrGnrSimGuideResponse pwrGnrSimGuideInfo =
+          //              pwrGnrSimService.selectPwrGnrSimulationGuideInfo();
+          //          if (pwrGnrSimGuideInfo != null) {
+          //            pwrGnrSimResponse.setGuideInfo(pwrGnrSimGuideInfo.getData());
+          //          }
         } catch (Exception e) {
         }
       }
@@ -958,26 +957,36 @@ public class EstimateService {
         // 템플릿 html 조회
         Document doc = PdfUtil.getPdfDoc(request, templateFilePath);
 
-        // 삭제하려는 element
-        Element elm;
-
-        arrSection[iSection] = "div.section1";
-        iSection++;
-        arrSection[iSection] = "div.section2";
-        iSection++;
-
         // 견적서 상세 pdf Html 생성
         doc = this.estimatePdfHtml(doc, estimateResponse, estimateItemList);
 
-        if ("1".equals(estimateRequest.getSchDrawingFlg())) {
-          arrSection[iSection] = "div.section3";
-          iSection++;
-          arrSection[iSection] = "div.section4";
-          iSection++;
-          arrSection[iSection] = "div.section5";
+        // 발전시뮬레이션 pdf Html 생성
+        doc = pwrGnrSimService.pwrGnrSimPdfHtml(doc, pwrGnrSimResponse);
 
-          // 발전시뮬레이션 pdf Html 생성
-          doc = pwrGnrSimService.pwrGnrSimPdfHtml(doc, pwrGnrSimResponse);
+        // SchDrawingFlg 1 : 전체 ,  2 : 견적서,  3 : 발전시뮬레이션, 4 : 도면
+        if ("1".equals(estimateRequest.getSchDrawingFlg())) {
+          arrSection[iSection] = "div.section1";
+          iSection++;
+          arrSection[iSection] = "div.section2";
+          iSection++;
+          arrSection[iSection] = "div.section3"; // 발전시뮬레이션
+          iSection++;
+          arrSection[iSection] = "div.section4"; // 도면
+          iSection++;
+          arrSection[iSection] = "div.section5"; // 도면
+        } else if ("2".equals(estimateRequest.getSchDrawingFlg())) {
+          arrSection[iSection] = "div.section1";
+          iSection++;
+          arrSection[iSection] = "div.section2";
+        } else if ("3".equals(estimateRequest.getSchDrawingFlg())) {
+          arrSection[iSection] = "div.section3"; // 발전시뮬레이션
+        } else if ("4".equals(estimateRequest.getSchDrawingFlg())) {
+          arrSection[iSection] = "div.section4"; // 도면
+          iSection++;
+          arrSection[iSection] = "div.section5"; // 도면
+        } else {
+          throw new QcastException(
+              ErrorCode.NOT_FOUND, message.getMessage("common.message.no.data"));
         }
 
         // pdf 다운로드
diff --git a/src/main/java/com/interplug/qcast/biz/pwrGnrSimulation/PwrGnrSimService.java b/src/main/java/com/interplug/qcast/biz/pwrGnrSimulation/PwrGnrSimService.java
index e17f083c..6763e65b 100644
--- a/src/main/java/com/interplug/qcast/biz/pwrGnrSimulation/PwrGnrSimService.java
+++ b/src/main/java/com/interplug/qcast/biz/pwrGnrSimulation/PwrGnrSimService.java
@@ -1513,8 +1513,7 @@ public class PwrGnrSimService {
     // 예측발전량
     StringBuilder sb = new StringBuilder();
     for (int i = 0; i < 13; i++) {
-      sb.append(
-          "<td>" + StringUtils.defaultString(String.format("%,d", pwrGnrSimList[i])) + "</td>");
+      sb.append("<td>" + StringUtils.defaultString(pwrGnrSimList[i]) + "</td>");
     }
 
     elm = doc.getElementById("frcPwrGnrList_detail");