From 36540bcb698b89741520d1793abcd07f2b7c4ef2 Mon Sep 17 00:00:00 2001 From: JIeunhuh Date: Thu, 22 May 2025 11:18:52 +0900 Subject: [PATCH 1/5] =?UTF-8?q?=ED=8C=8C=EC=9D=BC=20=EC=9C=84=EC=B9=98=20?= =?UTF-8?q?=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/sn/app/components/lib/{common => utils}/date.ts | 0 apps/sn/app/components/lib/utils/index.tsx | 1 + apps/sn/app/oper/floodPre/page.tsx | 2 +- apps/sn/app/oper/oldPp/page.tsx | 2 +- 4 files changed, 3 insertions(+), 2 deletions(-) rename apps/sn/app/components/lib/{common => utils}/date.ts (100%) diff --git a/apps/sn/app/components/lib/common/date.ts b/apps/sn/app/components/lib/utils/date.ts similarity index 100% rename from apps/sn/app/components/lib/common/date.ts rename to apps/sn/app/components/lib/utils/date.ts diff --git a/apps/sn/app/components/lib/utils/index.tsx b/apps/sn/app/components/lib/utils/index.tsx index 9cbcba6bb..0b9999c87 100644 --- a/apps/sn/app/components/lib/utils/index.tsx +++ b/apps/sn/app/components/lib/utils/index.tsx @@ -1,3 +1,4 @@ export { getCookie, setCookie, removeCookie } from "./cookie"; export { handleUpload } from "./fileUploadUtil"; export * from "./fileDownload"; +export * from './date' diff --git a/apps/sn/app/oper/floodPre/page.tsx b/apps/sn/app/oper/floodPre/page.tsx index 84ccfa743..08286aacf 100644 --- a/apps/sn/app/oper/floodPre/page.tsx +++ b/apps/sn/app/oper/floodPre/page.tsx @@ -10,7 +10,7 @@ import { searchData } from '@/components/lib/common/apiHelpers' import { tableHeadlist } from '..' import { handleDownload } from '@/components/lib/utils/fileDownload' import { handleUpload } from '@/components/lib/utils/fileUploadUtil' -import { formatDate } from '@/components/lib/common/date' +import { formatDate } from '@/components/lib/utils/date' const Page = () => { const [fromDate, setFromDate] = useState(new Date()) diff --git a/apps/sn/app/oper/oldPp/page.tsx b/apps/sn/app/oper/oldPp/page.tsx index 4f91d5121..227521dee 100644 --- a/apps/sn/app/oper/oldPp/page.tsx +++ b/apps/sn/app/oper/oldPp/page.tsx @@ -8,7 +8,7 @@ import ContentLayout from '@/components/ui/contentLayout' import { tableHeadlist } from '..' import { handleDownload } from '@/components/lib/utils/fileDownload' import { searchData } from '@/components/lib/common/apiHelpers' -import { formatDate } from '@/components/lib/common/date' +import { formatDate } from '@/components/lib/utils/date' // TODO: 임시 id export const tableData = [{ 'no': '1', 'fileNm': '2023년 노후하수관로 정비사업', 'mngYr': '2023', 'mngQu': '1', 'registDt': '2023-10-01', 'registUsr': '홍길동' },] From 26c28c53dbc7c3558bc6963519e67748b1f56050 Mon Sep 17 00:00:00 2001 From: yschoi Date: Fri, 23 May 2025 13:43:07 +0900 Subject: [PATCH 2/5] =?UTF-8?q?=ED=8C=8C=EC=9D=BC=EC=97=85=EB=A1=9C?= =?UTF-8?q?=EB=93=9C=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/sn/app/components/ui/fileUploadForm.tsx | 39 +++++++++----------- 1 file changed, 18 insertions(+), 21 deletions(-) diff --git a/apps/sn/app/components/ui/fileUploadForm.tsx b/apps/sn/app/components/ui/fileUploadForm.tsx index 736d8b4be..a842603e6 100644 --- a/apps/sn/app/components/ui/fileUploadForm.tsx +++ b/apps/sn/app/components/ui/fileUploadForm.tsx @@ -52,29 +52,26 @@ const FileUploadForm = ({ title, onSubmit }: { title: string, onSubmit:(files:Fi />
- { - const selectedFiles = e.target.files; - if (!selectedFiles) return; + { + const selectedFiles = e.target.files; + if (!selectedFiles) return; - const fileArray = Array.from(selectedFiles); - if(!fileArray){ - setFiles(fileArray); - } - if (fileArray[0]) { - handleUpload(selectedFiles, { - handleUploadStart: setUpload, - handleSuccess: setUpload, - handleResponse: handleUploadResponse(fileArray[0]), - }); - } + setFiles(selectedFiles); + if (selectedFiles[0]) { + handleUpload(selectedFiles, { + handleUploadStart: setUpload, + handleSuccess: setUpload, + handleResponse: handleUploadResponse(selectedFiles[0]), + }); + } - }} - customPreview={<>} - /> + }} + customPreview={<>} + />
+ + + +
+

사업정보 등록현황

+
+ +
- - - - - - -
-

사업정보 등록현황

-
- - -
-
- { if (index != null) { const fileName = tableData[index]?.fileNm ?? ""; setFileNm(fileName) } }} onPageChange={function (page: number): void { - throw new Error('Function not implemented.') - }}> - - - {}}/> - - -) + { if (index != null) { const fileName = tableData[index]?.fileNm ?? ""; setFileNm(fileName) } }} onPageChange={function (page: number): void { + throw new Error('Function not implemented.') + }}> + + + { await registFile }} /> + + + ) } export default Page \ No newline at end of file diff --git a/apps/sn/app/oper/oldPp/page.tsx b/apps/sn/app/oper/oldPp/page.tsx index 227521dee..fdbcde6e6 100644 --- a/apps/sn/app/oper/oldPp/page.tsx +++ b/apps/sn/app/oper/oldPp/page.tsx @@ -1,7 +1,7 @@ 'use client' import { SearchDiv, SearchFormLeft, SearchFormRight, UiTable } from '@common/business_components/ui' import { Button, DatePicker, Input, Label } from '@common/components/ui' -import React, { useState } from 'react' +import React, { useEffect, useState } from 'react' import FileUploadForm from '../../components/ui/fileUploadForm' import ListDiv from '@common/business_components/ui/list_div' import ContentLayout from '@/components/ui/contentLayout' @@ -9,9 +9,7 @@ import { tableHeadlist } from '..' import { handleDownload } from '@/components/lib/utils/fileDownload' import { searchData } from '@/components/lib/common/apiHelpers' import { formatDate } from '@/components/lib/utils/date' -// TODO: 임시 id - -export const tableData = [{ 'no': '1', 'fileNm': '2023년 노후하수관로 정비사업', 'mngYr': '2023', 'mngQu': '1', 'registDt': '2023-10-01', 'registUsr': '홍길동' },] +import { postData } from '@/components/lib/api' const Page = () => { const [fromDate, setFromDate] = useState(new Date()); const [toDate, setToDate] = useState(new Date()); @@ -20,15 +18,39 @@ const Page = () => { const [usr, setUsr] = useState('') const [pjNm, setpjNm] = useState('') const [fileNm, setFileNm] = useState('') - const isChckFile = () => { - if (fileNm === '' || fileNm === undefined) { - alert('파일을 선택해주세요') - return false - } - // TODO: 추후 파일코드 동적으로 세팅 - handleDownload('/sn/attach-service/api/v1/download/6066b08c-2a55-438c-b8ff-2aed9739a0c6', fileNm) - return true - } + const [atflId, setAtflId] = useState('') + const [atflCd, setAtflCd] = useState('') + const [tableData, setTableData] = useState() + useEffect(() => { + const fetchData = async () => { + const data = await searchData('v1/dcrpPpl', { + fromRegDt: formatDate(new Date()), + toRegDt: formatDate(new Date()), + page: '0', + size: '10' + }) + setTableData(data) + } + fetchData() + }, []) + const isChckFile = () => { + if (fileNm === '' || fileNm === undefined) { + alert('파일을 선택해주세요') + return false + } + handleDownload(`/sn/attach-service/api/v1/download/${atflId}}`, fileNm) + return true + } + const registFile = async (fileNm:string, year: string, quater: string,cd: string, id: string) => { + const data = await postData('api/v1/dcrpPpl', { + atflNm: fileNm, + mngYr: year, + mngQu: quater, + atflCd: cd, + atflId: id + }) + if (data.ok) { setAtflId(data.atflId); setAtflCd(data.atflCd) } + } return ( @@ -77,7 +99,7 @@ const Page = () => {
- + @@ -93,7 +115,7 @@ const Page = () => { }}> - { }} /> + { registFile }} /> ) From 96f89fafcc0fe13593e4210cdc6045d5f4c9a990 Mon Sep 17 00:00:00 2001 From: JIeunhuh Date: Fri, 23 May 2025 14:10:56 +0900 Subject: [PATCH 4/5] =?UTF-8?q?=ED=85=8C=EC=9D=B4=EB=B8=94=20=EC=B4=88?= =?UTF-8?q?=EA=B8=B0=EA=B0=92=20=EC=84=A4=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/sn/app/oper/floodPre/page.tsx | 2 +- apps/sn/app/oper/oldPp/page.tsx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/sn/app/oper/floodPre/page.tsx b/apps/sn/app/oper/floodPre/page.tsx index 4203205bc..0d307415d 100644 --- a/apps/sn/app/oper/floodPre/page.tsx +++ b/apps/sn/app/oper/floodPre/page.tsx @@ -21,7 +21,7 @@ const Page = () => { const [fileNm, setFileNm] = useState('') const [atflId, setAtflId] = useState('') const [atflCd, setAtflCd] = useState('') - const [tableData, setTableData] = useState() + const [tableData, setTableData] = useState([{}]) useEffect(() => { const fetchData = async () => { const data = await searchData('v1/sbmrgPrevnt', { diff --git a/apps/sn/app/oper/oldPp/page.tsx b/apps/sn/app/oper/oldPp/page.tsx index fdbcde6e6..48b2ec44e 100644 --- a/apps/sn/app/oper/oldPp/page.tsx +++ b/apps/sn/app/oper/oldPp/page.tsx @@ -20,7 +20,7 @@ const Page = () => { const [fileNm, setFileNm] = useState('') const [atflId, setAtflId] = useState('') const [atflCd, setAtflCd] = useState('') - const [tableData, setTableData] = useState() + const [tableData, setTableData] = useState([{}]) useEffect(() => { const fetchData = async () => { const data = await searchData('v1/dcrpPpl', { From d26c499c2a92dd099aa74a751875e0c1c36b5f79 Mon Sep 17 00:00:00 2001 From: JIeunhuh Date: Fri, 23 May 2025 14:26:45 +0900 Subject: [PATCH 5/5] =?UTF-8?q?url=20=EC=98=A4=ED=83=80=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/sn/app/oper/floodPre/page.tsx | 4 ++-- apps/sn/app/oper/oldPp/page.tsx | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/apps/sn/app/oper/floodPre/page.tsx b/apps/sn/app/oper/floodPre/page.tsx index 0d307415d..8fa3e9ae7 100644 --- a/apps/sn/app/oper/floodPre/page.tsx +++ b/apps/sn/app/oper/floodPre/page.tsx @@ -41,7 +41,7 @@ const Page = () => { handleDownload(`/attach-service/api/v1/download/${atflId}`, fileNm) } const registFile = async (fileNm: string, year: string, quater: string, cd: string, id: string) => { - const data = await postData('api/v1/sbmrgPrevnt', { + const data = await postData('v1/sbmrgPrevnt', { atflNm: fileNm, mngYr: year, mngQu: quater, @@ -114,7 +114,7 @@ const Page = () => { }}> - { await registFile }} /> + {await registFile(file, year,quater, cd,id) }} /> ) diff --git a/apps/sn/app/oper/oldPp/page.tsx b/apps/sn/app/oper/oldPp/page.tsx index 48b2ec44e..26a20d21e 100644 --- a/apps/sn/app/oper/oldPp/page.tsx +++ b/apps/sn/app/oper/oldPp/page.tsx @@ -42,7 +42,7 @@ const Page = () => { return true } const registFile = async (fileNm:string, year: string, quater: string,cd: string, id: string) => { - const data = await postData('api/v1/dcrpPpl', { + const data = await postData('v1/dcrpPpl', { atflNm: fileNm, mngYr: year, mngQu: quater, @@ -115,7 +115,7 @@ const Page = () => { }}> - { registFile }} /> + {await registFile(file, year,quater, cd,id)}} /> )