src/main/java/com/interplug/qcast/biz/estimate/EstimateService.java

@@ -1664,23 +1664,19 @@ public class EstimateService {
 
         String templateFilePath = "pdf_download_quotation_detail_template.html";
 
-     
         String userId = estimateRequest.getUserId();
         String storeLvl = estimateRequest.getStoreLvl();
         String createStoreId = estimateRequest.getCreateStoreId();
-        String hiddenYn = "N";
         if(storeLvl != null && !storeLvl.equals("1")){
           if(!Objects.equals(estimateResponse.getCreateSaleStoreId(), userId))
-        	hiddenYn = 'Y';
+            templateFilePath = "pdf_download_quotation_detail_template2.html";
-            //templateFilePath = "pdf_download_quotation_detail_template2.html";
         }
 
-
         // 템플릿 html 조회
         Document doc = PdfUtil.getPdfDoc(request, templateFilePath);
 
         // 견적서 상세 pdf Html 생성
-        doc = this.estimatePdfHtml(doc, estimateResponse, estimateItemList, hiddenYn);
+        doc = this.estimatePdfHtml(doc, estimateResponse, estimateItemList);
 
         // 발전시뮬레이션 pdf Html 생성
         doc = pwrGnrSimService.pwrGnrSimPdfHtml(doc, pwrGnrSimResponse);
@@ -2074,7 +2070,7 @@ public class EstimateService {
    * @throws IOException
    * @throws QcastException
    */
-  public Document estimatePdfHtml(Document doc, EstimateResponse data, List<ItemResponse> list, String hiddenYn)
+  public Document estimatePdfHtml(Document doc, EstimateResponse data, List<ItemResponse> list)
           throws IOException, QcastException {
 
     Element elm;
@@ -2127,10 +2123,8 @@ public class EstimateService {
     elm = doc.getElementById("totVolKw1");
     elm.text(StringUtils.defaultString(data.getTotVolKw()));
 
-    if (!"Y".equals(hiddenYn)) {
+    elm = doc.getElementById("totPrice");
-      elm = doc.getElementById("totPrice");
+    elm.text(StringUtils.defaultString(data.getTotPrice()));
-      elm.text(StringUtils.defaultString(data.getTotPrice()));
-    }
 
     StringBuilder sb = new StringBuilder();
     for (ItemResponse itemResponse : list) {
@@ -2143,14 +2137,14 @@ public class EstimateService {
               + "</td>");
       sb.append(
           "<td class='hide-column' style='width:80px;text-align:right;'>"
-              + !"Y".equals(hiddenYn) ? StringUtils.defaultString(itemResponse.getSalePrice()) : ""
+              + StringUtils.defaultString(itemResponse.getSalePrice())
               + "</td>");
       sb.append("<td style='width:60px;text-align:right;'>"
               + StringUtils.defaultString(itemResponse.getAmount()) + "</td>");
       sb.append(
               "<td style='width:60px;'>" + StringUtils.defaultString(itemResponse.getUnit()) + "</td>");
       sb.append("<td class='hide-column' style='width:80px;text-align:right;'>"
-              + !"Y".equals(hiddenYn) ? StringUtils.defaultString(itemResponse.getSaleTotPrice()) : "" + "</td>");
+              + StringUtils.defaultString(itemResponse.getSaleTotPrice()) + "</td>");
       sb.append("</tr>");
     }
     if ("Y".equals(data.getPkgYn())) {
@@ -2164,22 +2158,20 @@ public class EstimateService {
               + StringUtils.defaultString(data.getTotVol()) + "</td>");
       sb.append("<td style='width:60px;'>W</td>");
       sb.append("<td style='width:80px;text-align:right;'>"
-              + !"Y".equals(hiddenYn) ? StringUtils.defaultString(data.getPkgTotPrice()) : "" + "</td>");
+              + StringUtils.defaultString(data.getPkgTotPrice()) + "</td>");
       sb.append("</tr>");
     }
     elm = doc.getElementById("itemList_detail");
     elm.before(sb.toString());
 
-    if (!"Y".equals(hiddenYn)) {
+    elm = doc.getElementById("supplyPrice");
-	  elm = doc.getElementById("supplyPrice");
+    elm.text(StringUtils.defaultString(data.getSupplyPrice()));
-	  elm.text(StringUtils.defaultString(data.getSupplyPrice()));
 
-	  elm = doc.getElementById("vatPrice");
+    elm = doc.getElementById("vatPrice");
-	  elm.text(StringUtils.defaultString(data.getVatPrice()));
+    elm.text(StringUtils.defaultString(data.getVatPrice()));
 
-	  elm = doc.getElementById("totPrice1");
+    elm = doc.getElementById("totPrice1");
-	  elm.text(StringUtils.defaultString(data.getTotPrice()));
+    elm.text(StringUtils.defaultString(data.getTotPrice()));
-    }
 
     if (!StringUtils.isEmpty(data.getRemarks())) {
       elm = doc.getElementById("remarks");