From 5fd6184f422374afdbc2389f1101de37e3240916 Mon Sep 17 00:00:00 2001 From: yscha Date: Sun, 11 Jan 2026 15:31:03 +0900 Subject: [PATCH] =?UTF-8?q?1=EC=B0=A8=EC=A0=90=20=EA=B2=AC=EC=A0=81?= =?UTF-8?q?=EC=84=9C=202=EC=B0=A8=EC=A0=90=20=EA=B0=80=EA=B2=A9=EB=AF=B8?= =?UTF-8?q?=EB=85=B8=EC=B6=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../qcast/biz/estimate/EstimateService.java | 27 ++++++++++++------- .../biz/estimate/dto/EstimateRequest.java | 3 +++ 2 files changed, 20 insertions(+), 10 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 e3d59025..85320e7c 100644 --- a/src/main/java/com/interplug/qcast/biz/estimate/EstimateService.java +++ b/src/main/java/com/interplug/qcast/biz/estimate/EstimateService.java @@ -10,16 +10,7 @@ import java.net.HttpURLConnection; import java.net.URL; import java.net.URLConnection; import java.text.SimpleDateFormat; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Base64; -import java.util.Collections; -import java.util.Comparator; -import java.util.Date; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; +import java.util.*; import java.util.stream.Collectors; import com.interplug.qcast.biz.canvaspopupstatus.CanvasPopupStatusService; @@ -1665,6 +1656,14 @@ public class EstimateService { String templateFilePath = "pdf_download_quotation_detail_template.html"; + String userId = estimateRequest.getUserId(); + String storeLvl = estimateRequest.getStoreLvl(); + String saleStoreId = estimateRequest.getSaleStoreId(); + if(storeLvl != null && storeLvl.equals("2")){ + if(!Objects.equals(Objects.requireNonNull(saleStoreId), userId)) + templateFilePath = "pdf_download_quotation_detail_template2.html"; + } + // 템플릿 html 조회 Document doc = PdfUtil.getPdfDoc(request, templateFilePath); @@ -1710,6 +1709,14 @@ 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(); + if(storeLvl != null && storeLvl.equals("2")){ + if(!Objects.equals(Objects.requireNonNull(saleStoreId), userId)) + excelTemplateNam = "excel_download_quotation_detail_template2.xlsx"; + } + // itemGroup이 "STAND_"가 아닌 항목들만 필터링하여 새로운 리스트 생성 List estimateItemList15 = estimateItemList.stream() diff --git a/src/main/java/com/interplug/qcast/biz/estimate/dto/EstimateRequest.java b/src/main/java/com/interplug/qcast/biz/estimate/dto/EstimateRequest.java index 01fde921..54848546 100644 --- a/src/main/java/com/interplug/qcast/biz/estimate/dto/EstimateRequest.java +++ b/src/main/java/com/interplug/qcast/biz/estimate/dto/EstimateRequest.java @@ -216,4 +216,7 @@ public class EstimateRequest { @Schema(description = "2차 SAP 판매점코드") private String secSapSalesStoreCd; + @Schema(description = "판매점레벨") + private String storeLvl; + }