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,9 +1646,9 @@ 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))
+          if(!Objects.equals(createStoreId, userId))
             templateFilePath = "pdf_download_quotation_detail_template2.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<ItemResponse> estimateItemList15 = estimateItemList.stream()
                 .filter(item -> !"STAND_".equals(item.getItemGroup()))
@@ -2125,13 +2115,15 @@ public class EstimateService {
               + StringUtils.defaultString(itemResponse.getItemName()) + "</td>");
       sb.append("<td style='width:120px;'>" + StringUtils.defaultString(itemResponse.getItemNo())
               + "</td>");
-      sb.append("<td style='width:80px;text-align:right;'>"
+      sb.append(
-              + StringUtils.defaultString(itemResponse.getSalePrice()) + "</td>");
+          "<td class='hide-column' style='width:80px;text-align:right;'>"
+              + 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 style='width:80px;text-align:right;'>"
+      sb.append("<td class='hide-column' style='width:80px;text-align:right;'>"
               + StringUtils.defaultString(itemResponse.getSaleTotPrice()) + "</td>");
       sb.append("</tr>");
     }

src/main/resources/template/pdf/pdf_download_quotation_detail_template2.html

@@ -390,6 +390,10 @@
             font-size: 8px;
         }
 
+        .hide-column {
+            display: none;
+        }
+
     </style>
 </head>
 <body>
@@ -492,7 +496,7 @@
             <th style="width: 110px;">価格</th>
         </tr>
         </thead>
-        <tbody id="itemList_detail2">
+        <tbody id="itemList_detail" >
         <!--        <tr>-->
         <!--            <td>1</td>-->
         <!--            <td>Re.RISE 415</td>-->
@@ -513,16 +517,16 @@
         <!--        </tr>-->
         <tr>
             <td class="al-r" colspan="6">小計</td>
-            <td class="al-r" ></td>
+            <td class="al-r hide-column" id="supplyPrice"></td>
         </tr>
         <tr>
             <td class="al-r" colspan="5">消費税</td>
             <td class="al-r">(10%)</td>
-            <td class="al-r" ></td>
+            <td class="al-r hide-column" id="vatPrice"></td>
         </tr>
         <tr>
             <td class="al-r end" colspan="6">合計金額</td>
-            <td class="al-r end" ></td>
+            <td class="al-r end hide-column" id="totPrice1"></td>
         </tr>
         </tbody>
     </table>
@@ -875,7 +879,7 @@
 
 </div>
 <div class="section6">
-<!--    <h1 class="title">重量算出シート</h1>-->
+    <!--    <h1 class="title">重量算出シート</h1>-->
     <div class="all-price-wrap">
         <div class="all-price">
             <span>重量算出シート</span>