Merge pull request 'dev' (#143) from dev into dev-deploy

Reviewed-on: #143

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

@@ -1619,6 +1619,13 @@ public class EstimateService {
         if (estimateRequest.getSchDrawingFlg().indexOf("4") < 0) {
         }
 
+        if ("EXCEL2".equals(estimateRequest.getSchDownload())) {
+          workbook.removeSheetAt(workbook.getSheetIndex("特異事項"));
+          workbook.removeSheetAt(workbook.getSheetIndex("発電シミュレーション"));
+          workbook.removeSheetAt(workbook.getSheetIndex("割付図・系統図"));
+          workbook.removeSheetAt(workbook.getSheetIndex("架台図"));
+        }
+
         ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
         workbook.write(byteArrayOutputStream);
         excelBytes = byteArrayOutputStream.toByteArray();

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

@@ -755,9 +755,9 @@
             <td id="snowfall5"></td>
         </tr>
         <tr>
-            <th class="col-15">設備容量</th>
+            <th class="col-15">モジュール容量</th>
             <td class="col-12" id="totVolKw5"></td>
-            <th class="col-15">認証容量</th>
+            <th class="col-15">認定容量</th>
             <td class="col-12" id="certVolKw5"></td>
             <th class="col-15">風速条件</th>
             <td id="standardWindSpeedName5"></td>