From 56aef1c0013820887edb1a2eef8a772040bcc385 Mon Sep 17 00:00:00 2001
From: basssy <basssy@interplug.co.kr>
Date: Wed, 4 Dec 2024 10:41:35 +0900
Subject: [PATCH] =?UTF-8?q?=EA=B2=AC=EC=A0=81=EC=84=9C=20=EC=B2=A8?=
 =?UTF-8?q?=EB=B6=80=ED=8C=8C=EC=9D=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/estimate/Estimate.jsx          |   7 +-
 .../estimate/useEstimateController.js         | 172 ++++++++++--------
 2 files changed, 103 insertions(+), 76 deletions(-)

diff --git a/src/components/estimate/Estimate.jsx b/src/components/estimate/Estimate.jsx
index 6b257645..192a7e8e 100644
--- a/src/components/estimate/Estimate.jsx
+++ b/src/components/estimate/Estimate.jsx
@@ -61,7 +61,7 @@ export default function Estimate({ params }) {
   const objectRecoil = useRecoilValue(floorPlanObjectState)
 
   //견적서 상세데이터
-  const { estimateContextState, setEstimateContextState, addItem } = useEstimateController(params.pid)
+  const { estimateContextState, setEstimateContextState, addItem, handleEstimateFileDownload } = useEstimateController(params.pid)
 
   //견적특이사항 List
   const [specialNoteList, setSpecialNoteList] = useState([])
@@ -1153,7 +1153,10 @@ export default function Estimate({ params }) {
                               return (
                                 <li className="file-item" key={uuidv4()}>
                                   <div className="file-item-wrap">
-                                    <span style={{ display: originFile.delFlg === '0' ? '' : 'none' }}>
+                                    <span
+                                      style={{ display: originFile.delFlg === '0' ? '' : 'none' }}
+                                      onClick={() => handleEstimateFileDownload(originFile)}
+                                    >
                                       {originFile.faileName}
                                       <button
                                         type="button"
diff --git a/src/hooks/floorPlan/estimate/useEstimateController.js b/src/hooks/floorPlan/estimate/useEstimateController.js
index 63f92832..cde893ed 100644
--- a/src/hooks/floorPlan/estimate/useEstimateController.js
+++ b/src/hooks/floorPlan/estimate/useEstimateController.js
@@ -42,6 +42,12 @@ export const useEstimateController = (planNo) => {
     }
   }, [])
 
+  useEffect(() => {
+    if (fileList.length > 0) {
+      realSave(fileList)
+    }
+  }, [fileList])
+
   // 상세 조회
   const fetchSetting = async (objectNo, planNo) => {
     try {
@@ -154,14 +160,17 @@ export const useEstimateController = (planNo) => {
     // console.log('새로추가첨부파일:::', estimateData.newFileList)
     // console.log('기존첨부파일:::', estimateData.originFiles)
 
-    // return
+    // console.log('estimateData::', estimateData)
 
+    //기존에 첨부된 파일이 있으면 파일첨부관련 통과
     if (estimateData?.originFiles?.length > 0) {
       originFileFlg = true
     }
     if (flag) {
       if (!originFileFlg) {
+        //기존에 첨부된 파일이 없으면
         if (estimateData.newFileList?.length < 1) {
+          //새로 첨부한 파일이 있으면
           if (estimateData.itemList.length > 1) {
             estimateData.itemList.map((row) => {
               if (row.delFlg === '0') {
@@ -217,26 +226,7 @@ export const useEstimateController = (planNo) => {
           }
         }
       })
-    }
 
-    if (flag && fileFlg && itemFlg) {
-      //1. 첨부파일 저장시작
-      const formData = new FormData()
-      if (estimateData?.newFileList?.length > 0) {
-        estimateData.newFileList.forEach((file) => {
-          formData.append('files', file)
-        })
-        formData.append('objectNo', estimateData.objectNo)
-        formData.append('planNo', estimateData.planNo)
-        formData.append('category', '10')
-        formData.append('userId', estimateData.userId)
-
-        await post({ url: '/api/file/fileUpload', data: formData }).then((res) => {
-          console.log('리턴::::::::::::', res)
-        })
-      }
-
-      //첨부파일저장끝
       estimateData.itemList = estimateData.itemList.filter((item) => item.delFlg === '0' || !item.addFlg)
 
       let delCnt = 0
@@ -248,66 +238,100 @@ export const useEstimateController = (planNo) => {
       if (delCnt === estimateData.itemList.length) {
         return alert(getMessage('estimate.detail.save.requiredItem'))
       }
+    }
 
-      let option = []
-      estimateData.itemList.forEach((item) => {
-        if (item.specialNoteCd) {
-          let split2 = item.specialNoteCd.split('、')
-          option = option.concat(split2)
-        }
-      })
-
-      let estimateOptions = ''
-      let estimateOptionsArray
-      estimateData.specialNoteList.map((item) => {
-        if (item.pkgYn === '0') {
-          if (item.check) {
-            if (estimateOptions === '') {
-              estimateOptions = item.code
-            } else {
-              estimateOptions += '、' + item.code
-            }
-          }
-        } else {
-          if (item.check) {
-            let flg = '0'
-            for (let i = 0; i < estimateData.uniqueData.length; i++) {
-              if (item.code.indexOf(estimateData.uniqueData[i]) > -1) {
-                flg = '1'
-              }
-              if (flg === '1') {
-                estimateOptions += '、' + estimateData.uniqueData[i]
-              }
-            }
-          }
-        }
-      })
-
-      estimateOptionsArray = estimateOptions.split('、').sort()
-      estimateOptionsArray = Array.from(new Set(estimateOptionsArray))
-
-      estimateOptions = estimateOptionsArray.join('、')
-
-      estimateData.estimateOption = estimateOptions
-      // console.log('첨부파일::::::::', fileList)
-      // console.log('최종아이템:::', estimateData.itemList)
-      console.log('최종저장::', estimateData)
-      //2. 상세데이터 저장
-      // return
-      try {
-        await promisePost({ url: `${ESTIMATE_API_ENDPOINT}/save-estimate`, data: estimateData }).then((res) => {
-          if (res.status === 201) {
-            alert(getMessage('estimate.detail.save.alertMsg'))
-            //어디로 보낼지
-            fetchSetting(objectRecoil.floorPlanObjectNo, estimateData.planNo)
-          }
+    if (flag && fileFlg && itemFlg) {
+      //1. 첨부파일 저장시작
+      const formData = new FormData()
+      if (estimateData?.newFileList?.length > 0) {
+        console.log('새로추가한 첨부파일있음:::', estimateData?.newFileList)
+        estimateData.newFileList.forEach((file) => {
+          formData.append('files', file)
         })
-      } catch (e) {
-        console.log('error::::::::::::', e.response.data.message)
+        formData.append('objectNo', estimateData.objectNo)
+        formData.append('planNo', estimateData.planNo)
+        formData.append('category', '10')
+        formData.append('userId', estimateData.userId)
+
+        await post({ url: '/api/file/fileUpload', data: formData }).then((res) => {
+          setFileList(res)
+        })
+      } else {
+        realSave()
       }
     }
   }
 
+  const realSave = async (fileList) => {
+    //첨부파일저장끝
+
+    let option = []
+    estimateData.itemList.forEach((item) => {
+      if (item.specialNoteCd) {
+        let split2 = item.specialNoteCd.split('、')
+        option = option.concat(split2)
+      }
+    })
+
+    let estimateOptions = ''
+    let estimateOptionsArray
+    estimateData.specialNoteList.map((item) => {
+      if (item.pkgYn === '0') {
+        if (item.check) {
+          if (estimateOptions === '') {
+            estimateOptions = item.code
+          } else {
+            estimateOptions += '、' + item.code
+          }
+        }
+      } else {
+        if (item.check) {
+          let flg = '0'
+          for (let i = 0; i < estimateData.uniqueData.length; i++) {
+            if (item.code.indexOf(estimateData.uniqueData[i]) > -1) {
+              flg = '1'
+            }
+            if (flg === '1') {
+              estimateOptions += '、' + estimateData.uniqueData[i]
+            }
+          }
+        }
+      }
+    })
+
+    estimateOptionsArray = estimateOptions.split('、').sort()
+    estimateOptionsArray = Array.from(new Set(estimateOptionsArray))
+
+    estimateOptions = estimateOptionsArray.join('、')
+
+    estimateData.estimateOption = estimateOptions
+    // console.log('최종아이템:::', estimateData.itemList)
+    if (fileList?.length > 0) {
+      estimateData.fileList = fileList
+    } else {
+      estimateData.fileList = []
+    }
+    if (estimateData.originFiles?.length > 0) {
+      estimateData.deleteFileList = estimateData.originFiles?.filter((item) => item.delFlg === '1')
+    } else {
+      estimateData.deleteFileList = []
+    }
+    console.log('최종저장::', estimateData)
+    //2. 상세데이터 저장
+    // return
+    try {
+      await promisePost({ url: `${ESTIMATE_API_ENDPOINT}/save-estimate`, data: estimateData }).then((res) => {
+        if (res.status === 201) {
+          alert(getMessage('estimate.detail.save.alertMsg'))
+          //어디로 보낼지
+          fetchSetting(objectRecoil.floorPlanObjectNo, estimateData.planNo)
+        }
+      })
+    } catch (e) {
+      console.log('error::::::::::::', e.response.data.message)
+    }
+  }
+
   /**
    *  견적서 복사버튼
    *  (견적서 번호(estimateData.docNo)가 생성된 이후 버튼 활성화 )