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

Reviewed-on: #327

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

@@ -1335,9 +1335,19 @@ public class EstimateService {
     }
 
     try {
+    	
       // 견적서 상세 조회
       estimateResponse = estimateMapper.selectEstimatePdfDetail(estimateRequest);
       
+      // 1차점이 2차점 견적서를 만들어 준 경우 - 2차점 사용자가 다운받을 시 무조건 정가로만 표시
+      String userId = estimateRequest.getUserId();
+      String storeLvl = estimateRequest.getStoreLvl();
+      if (storeLvl != null && !storeLvl.equals("1")) {
+        if (!Objects.equals(estimateResponse.getCreateSaleStoreId(), userId)) {
+          estimateRequest.setSchUnitPriceFlg("1");     
+        }
+      }
+
       // file Name 명이 없는경우
       if (estimateRequest.getFileName() == null || "".equals(estimateRequest.getFileName())) {
         estimateRequest.setFileName(estimateResponse.getObjectNo() + "_"
@@ -1664,13 +1674,6 @@ public class EstimateService {
 
         String templateFilePath = "pdf_download_quotation_detail_template.html";        
        
-        String userId = estimateRequest.getUserId();
-        String storeLvl = estimateRequest.getStoreLvl();
-        String createStoreId = estimateRequest.getCreateStoreId();
-        if(storeLvl != null && !storeLvl.equals("1")){
-          if(!Objects.equals(estimateResponse.getCreateSaleStoreId(), userId))
-            templateFilePath = "pdf_download_quotation_detail_template2.html";
-        }
 
         // 템플릿 html 조회
         Document doc = PdfUtil.getPdfDoc(request, templateFilePath);
@@ -1718,16 +1721,6 @@ public class EstimateService {
 
         String excelTemplateNam = "excel_download_quotation_detail_template.xlsx";
 
-        String userId = estimateRequest.getUserId();
-        String storeLvl = estimateRequest.getStoreLvl();
-        String createStoreId = estimateRequest.getCreateStoreId();
-        if(storeLvl != null && !storeLvl.equals("1")){
-          if(!Objects.equals(estimateResponse.getCreateSaleStoreId(), userId))
-            excelTemplateNam = "excel_download_quotation_detail_template2.xlsx";
-        }
-
-
-
         // itemGroup이 "STAND_"가 아닌 항목들만 필터링하여 새로운 리스트 생성
         List<ItemResponse> estimateItemList15 = estimateItemList.stream()
                 .filter(item -> !"STAND_".equals(item.getItemGroup()))