From 5ddbf6cd024770e99ae9605b4917b6f969b083be Mon Sep 17 00:00:00 2001
From: sanguu516 <sanguu516@naver.com>
Date: Mon, 2 Sep 2024 19:55:55 +0900
Subject: [PATCH] =?UTF-8?q?feat/=ED=95=9C=EA=B8=80,=20=EC=97=91=EC=85=80?=
 =?UTF-8?q?=20=EB=8B=A4=EC=9A=B4=EB=A1=9C=EB=93=9C=20=ED=8C=8C=EB=9D=BC?=
 =?UTF-8?q?=EB=AF=B8=ED=84=B0=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../flight/ControlApprovalsTable.js           | 36 +++++++++++++++++--
 .../flight/ControlApprovalsContainer.js       |  2 ++
 .../flight/OperationApprovalsContainer.js     |  1 +
 .../popup/ControlApprovalsPopupContainer.js   |  1 +
 4 files changed, 38 insertions(+), 2 deletions(-)

diff --git a/src/components/flight/ControlApprovalsTable.js b/src/components/flight/ControlApprovalsTable.js
index 4ff7ccb1..926e5648 100644
--- a/src/components/flight/ControlApprovalsTable.js
+++ b/src/components/flight/ControlApprovalsTable.js
@@ -638,13 +638,45 @@ export default function ControlApprovalsTable(props) {
 
   const handleFileDownload = async type => {
     try {
+      const params = {
+        applyNo: props.filterId === '' ? null : props.filterId,
+        searchStDt: props.startDate,
+        searchEndDt: props.endDate,
+        ctprvn:
+          props.filterArea.ctprvn === '전체' ? null : props.filterArea.ctprvn,
+        sig: props.filterArea.sig === '전체' ? null : props.filterArea.sig,
+        reviewedType:
+          props.checkState.reviewedType === '전체'
+            ? null
+            : props.checkState.reviewedType,
+        reviewedProcType:
+          props.checkState.reviewedProcType === '전체'
+            ? null
+            : props.checkState.reviewedProcType,
+        limitZoneCd:
+          props.checkState.limitZoneNm === '전체'
+            ? null
+            : props.checkState.limitZoneNm,
+        adress:
+          props.filterArea.address === '전체' ? null : props.filterArea.address
+      };
+
+      const filteredParams = Object.entries(params)
+        .filter(([_, value]) => value !== null) // null이 아닌 값만 필터링
+        .reduce((acc, [key, value]) => {
+          acc[key] = value;
+          return acc;
+        }, {});
+
+      const queryString = new URLSearchParams(filteredParams).toString();
+
       const fileDetails = {
         pdf: {
-          url: `${HOST}api/bas/dos/plan/download/han-com?searchStDt=${props.startDate}&searchEndDt=${props.endDate}`,
+          url: `${HOST}api/bas/dos/plan/download/han-com?${queryString}`,
           name: '비행승인 관련 검토결과.hwp'
         },
         excel: {
-          url: `${HOST}api/bas/dos/plan/download/excel?searchStDt=${props.startDate}&searchEndDt=${props.endDate}`,
+          url: `${HOST}api/bas/dos/plan/download/excel?${queryString}`,
           name: '비행승인 검토.xlsx'
         }
       };
diff --git a/src/containers/flight/ControlApprovalsContainer.js b/src/containers/flight/ControlApprovalsContainer.js
index 364e6fb6..5202a049 100644
--- a/src/containers/flight/ControlApprovalsContainer.js
+++ b/src/containers/flight/ControlApprovalsContainer.js
@@ -790,6 +790,8 @@ export default function ControlApprovalsContainer({ mode }) {
                 startDate={startDate}
                 endDate={endDate}
                 selected={selected}
+                checkState={checkState}
+                handlerSearch={handlerSearch}
                 handlerDetail={handlerDetail}
               />
             </div>
diff --git a/src/containers/flight/OperationApprovalsContainer.js b/src/containers/flight/OperationApprovalsContainer.js
index b8e9a646..30992bef 100644
--- a/src/containers/flight/OperationApprovalsContainer.js
+++ b/src/containers/flight/OperationApprovalsContainer.js
@@ -925,6 +925,7 @@ export default function OperationApprovalsContainer({ mode }) {
                 selected={selected}
                 selectedPlanSno={selectedPlanSno}
                 handlerDetail={handlerDetail}
+                handlerSearch={handlerSearch}
               />
             </div>
           </div>
diff --git a/src/containers/flight/popup/ControlApprovalsPopupContainer.js b/src/containers/flight/popup/ControlApprovalsPopupContainer.js
index 59203137..4c0198b7 100644
--- a/src/containers/flight/popup/ControlApprovalsPopupContainer.js
+++ b/src/containers/flight/popup/ControlApprovalsPopupContainer.js
@@ -177,6 +177,7 @@ function ControlApprovalsPopupContainer() {
             selected={selected}
             handlerDetail={handlerDetail}
             handlerSearch={handlerSearch}
+            checkState={checkState}
           />
         </div>
       </div>