From eecc5c7e04c3a7811e3b6da8c01eeb5d558d2a44 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EA=B0=95=EC=84=9D=20=EC=B5=9C?= <cks0504_p@daum.net>
Date: Wed, 25 Jan 2023 13:04:53 +0900
Subject: [PATCH] =?UTF-8?q?=EA=B2=AC=EB=AC=B8=EB=B3=B4=EA=B3=A0=EC=84=9C?=
 =?UTF-8?q?=20=EC=B2=A8=EB=B6=80=ED=8C=8C=EC=9D=BC=20=EC=9D=BC=EA=B4=84=20?=
 =?UTF-8?q?=EB=8B=A4=EC=9A=B4=EB=A1=9C=EB=93=9C=20=EC=9E=91=EC=97=85?=
 =?UTF-8?q?=EC=99=84=EB=A3=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/dbnt/faisp/config/FileController.java |  7 +++---
 .../igActivities/fpiMgt/affair/affairMgt.js   | 22 +++----------------
 2 files changed, 7 insertions(+), 22 deletions(-)

diff --git a/src/main/java/com/dbnt/faisp/config/FileController.java b/src/main/java/com/dbnt/faisp/config/FileController.java
index b979cfc1..12b54d32 100644
--- a/src/main/java/com/dbnt/faisp/config/FileController.java
+++ b/src/main/java/com/dbnt/faisp/config/FileController.java
@@ -31,6 +31,7 @@ import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.time.LocalDate;
+import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -126,7 +127,7 @@ public class FileController extends BaseService{
     }
   }
 
-  @PostMapping("/downloadAffairFiles")
+  @GetMapping("/downloadAffairFiles")
   public void downloadAffairFiles(HttpServletRequest request,
                                   HttpServletResponse response,
                                   @RequestParam(value="affairKeyList") List<Integer> affairKeyList){
@@ -147,10 +148,9 @@ public class FileController extends BaseService{
     if (!saveFolder.exists() || saveFolder.isFile()) {
       saveFolder.mkdirs();
     }
-    String downloadFileName = "견문보고서 첨부파일_"+ LocalDate.now().format(DateTimeFormatter.ofPattern("yyyyMMdd"))+".zip";
+    String downloadFileName = "견문보고서 첨부파일_"+ LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyyMMddHHmmss"))+".zip";
     zipFile += File.separator+downloadFileName;
     try{
-      setDisposition(zipFile, request, response);
       // ZipOutputStream을 FileOutputStream 으로 감쌈
       FileOutputStream fout = new FileOutputStream(zipFile);
       ZipOutputStream zout = new ZipOutputStream(fout);
@@ -177,6 +177,7 @@ public class FileController extends BaseService{
       zout.close();
 
 
+      setDisposition(downloadFileName, request, response);
       in=new BufferedInputStream(new FileInputStream(zipFile));
       out=new BufferedOutputStream(response.getOutputStream());
       FileCopyUtils.copy(in, out);
diff --git a/src/main/resources/static/js/igActivities/fpiMgt/affair/affairMgt.js b/src/main/resources/static/js/igActivities/fpiMgt/affair/affairMgt.js
index 22549c06..8272b7f8 100644
--- a/src/main/resources/static/js/igActivities/fpiMgt/affair/affairMgt.js
+++ b/src/main/resources/static/js/igActivities/fpiMgt/affair/affairMgt.js
@@ -154,27 +154,11 @@ $(document).on('click', '#fileDownBtn', function (){
     return false;
   }
   if(confirm("선택된 견문의 파일을 다운로드 하시겠습니까?")){
-    const formData = new FormData();
+    let url = "/file/downloadAffairFiles?affairKeyList="
     $.each(selectedList, function(idx, chkBox){
-      formData.append("affairKeyList", $(chkBox).parents("tr").find(".affairKey").val());
-    })
-    contentFade("in");
-    $.ajax({
-      type : 'POST',
-      data : formData,
-      url : "/file/downloadAffairFiles",
-      processData: false,
-      contentType: false,
-      beforeSend: function (xhr){
-        xhr.setRequestHeader($("[name='_csrf_header']").val(), $("[name='_csrf']").val());
-      },
-      success : function(result) {
-        contentFade("out");
-      },
-      error : function(xhr, status) {
-        contentFade("out");
-      }
+      url += $(chkBox).parents("tr").find(".affairKey").val()+",";
     })
+    window.open(encodeURI(url));
   }
 })