From d69c00831826b5aeab60d86193a1cb3e387666ce Mon Sep 17 00:00:00 2001
From: "DESKTOP-6ARNG1Q\\dlsgk" <dlsgks29@interplug.co.kr>
Date: Fri, 15 Nov 2024 10:27:40 +0900
Subject: [PATCH] =?UTF-8?q?=EB=8B=A4=EC=9A=B4=EB=A1=9C=EB=93=9C=20?=
 =?UTF-8?q?=EC=84=A4=EC=A0=95=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../interplug/qcast/biz/estimate/EstimateService.java  | 10 +++++++++-
 src/main/java/com/interplug/qcast/util/ExcelUtil.java  |  1 +
 src/main/java/com/interplug/qcast/util/PdfUtil.java    |  1 +
 3 files changed, 11 insertions(+), 1 deletion(-)

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 effa91ca..a5bb62a3 100644
--- a/src/main/java/com/interplug/qcast/biz/estimate/EstimateService.java
+++ b/src/main/java/com/interplug/qcast/biz/estimate/EstimateService.java
@@ -28,6 +28,7 @@ import java.beans.PropertyDescriptor;
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;
 import java.math.BigDecimal;
+import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.List;
 import lombok.RequiredArgsConstructor;
@@ -711,7 +712,13 @@ public class EstimateService {
   public void excelDownload(
       HttpServletRequest request, HttpServletResponse response, EstimateRequest estimateRequest)
       throws Exception {
-    ExcelUtil excelUtil = new ExcelUtil();
+
+    // file Name 명이 없는경우
+    if (estimateRequest.getFileName() == null || "".equals(estimateRequest.getFileName())) {
+      estimateRequest.setFileName(
+          "Quation_Detail_" + new SimpleDateFormat("yyyyMMdd").format(new Date()));
+    }
+
     EstimateResponse estimateResponse = new EstimateResponse();
     String splitStr = "、";
 
@@ -881,6 +888,7 @@ public class EstimateService {
 
         String excelTemplateNam = "excel_download_quotation_detail_template.xlsx";
 
+        ExcelUtil excelUtil = new ExcelUtil();
         excelUtil.download(
             request,
             response,
diff --git a/src/main/java/com/interplug/qcast/util/ExcelUtil.java b/src/main/java/com/interplug/qcast/util/ExcelUtil.java
index 90213d47..37ed9e7b 100644
--- a/src/main/java/com/interplug/qcast/util/ExcelUtil.java
+++ b/src/main/java/com/interplug/qcast/util/ExcelUtil.java
@@ -47,6 +47,7 @@ public class ExcelUtil {
       InputStream is = new BufferedInputStream(templateStream);
 
       response.setHeader("Content-Disposition", "attachment; filename=\"" + fileName + ".xlsx\"");
+      response.addHeader("Access-Control-Expose-Headers", "Content-Disposition");
 
       try (OutputStream os = response.getOutputStream()) {
         Context context = new Context();
diff --git a/src/main/java/com/interplug/qcast/util/PdfUtil.java b/src/main/java/com/interplug/qcast/util/PdfUtil.java
index ae25eb62..a9b6bf3a 100644
--- a/src/main/java/com/interplug/qcast/util/PdfUtil.java
+++ b/src/main/java/com/interplug/qcast/util/PdfUtil.java
@@ -73,6 +73,7 @@ public class PdfUtil {
     // 응답에 PDF 설정
     response.setContentType("application/pdf");
     response.setHeader("Content-Disposition", "attachment; filename=\"" + pdfFileName + "\"");
+    response.addHeader("Access-Control-Expose-Headers", "Content-Disposition");
 
     try (OutputStream os = response.getOutputStream();
         PdfWriter writer = new PdfWriter(os);