지도점검현황 빗물 init 추가, 중수도 조회 추가

apps/wr/app/matMng/coMng/ldrmntCoSttn/page.tsx

@@ -99,8 +99,8 @@ export default function LdrmntCoSttn() {
     const tbData = Array.isArray(data)
       ? data.map((item: customLdrmnt) => ({
         ...item,
-        ctpvCd: item.fctryAddr.split(" ")[0] || "",
-        sggCd: item.fctryAddr.split(" ")[1] || ""
+        ctpvCd: item.fctryAddr?.split(" ")[0] || "",
+        sggCd: item.fctryAddr?.split(" ")[1] || ""
 
       }))
       : [];
@@ -114,8 +114,8 @@ export default function LdrmntCoSttn() {
     const data = Array.isArray(exData)
       ? exData.map((item: customLdrmnt) => {
         return {
-          "시도": item.fctryAddr.split(" ")[0] || "",
-          "시군구": item.fctryAddr.split(" ")[1] || "",
+          "시도": item.fctryAddr?.split(" ")[0] || "",
+          "시군구": item.fctryAddr?.split(" ")[1] || "",
           "회사명": item.dmdCoNm,
           "공장주소": item.fctryAddr,
           "공장관리번호": item.fctryMngNo,

apps/wr/app/ruseFcltMng/prfmncSttn/chkgdnSttn/page.tsx

@@ -33,10 +33,9 @@ export default function Page() {
     code,
     rainChkSttn,
     rswtChkSttn,
-
-
     rainChkSttnInit,
     rainChkSttnSearch,
+    rswtChkSttnSearch,
     rswtChkSttnInit,
     isRainSttn,
     isRswtSttn
@@ -51,25 +50,31 @@ export default function Page() {
   });
   const [searchYear, setSearchYear] = useState<string>(String(new Date().getFullYear()));
   const cellClick = () => {
-    if (searchYear) rainChkSttnSearch(searchYear, "0");
+    if (searchYear) {
+      if(selFcltDiv === "RNB"){
+        rainChkSttnSearch(searchYear, "0");
+      }else{
+        rswtChkSttnSearch(searchYear, "0");
+      }
+    }
   };
 
   useEffect(() => {
     if (!rainChkSttn.isInit) {
       isRainSttn(true)
-      rainChkSttnInit( "0");
+      rainChkSttnInit(new Date().getFullYear().toString(), "0");
       setIsModal({ data: {}, open: false });
     }
   }, [rainChkSttn.isInit, rainChkSttnInit]);
 
-  useEffect(() => { 
+  useEffect(() => {
 
     if (!rswtChkSttn.isInit) {
       setIsModal({ data: {}, open: false });
-      rswtChkSttnInit( "0");
+      rswtChkSttnInit(new Date().getFullYear().toString(), "0");
       isRswtSttn(true)
     }
-  },[rswtChkSttn.isInit, rswtChkSttnInit])
+  }, [rswtChkSttn.isInit, rswtChkSttnInit])
 
 
   const handleClick = useCallback(
@@ -78,25 +83,25 @@ export default function Page() {
     },
     [isModal]
   );
-const excelDown=() =>{
-  if(rainChkSttn.sttnExcelList && selFcltDiv === "RNB"){
-    excelDownload(
-      rainChkSttn.sttnExcelList,
-      "빗물이용시설 지도점검 현황",
-      "sample_rainChkSttn.xlsx",
-      "A1:Q2",
-      3
-    );
-  }else if(rswtChkSttn.sttnExcelList && selFcltDiv === "RST"){
-    excelDownload(
-      rswtChkSttn.sttnExcelList,
-      "중수도시설 지도점검 현황",
-      "sample_rswtChkSttn.xlsx",
-      "A1:X2",
-      3
-    );
+  const excelDown = () => {
+    if (rainChkSttn.sttnExcelList && selFcltDiv === "RNB") {
+      excelDownload(
+        rainChkSttn.sttnExcelList,
+        "빗물이용시설 지도점검 현황",
+        "sample_rainChkSttn.xlsx",
+        "A1:Q2",
+        3
+      );
+    } else if (rswtChkSttn.sttnExcelList && selFcltDiv === "RST") {
+      excelDownload(
+        rswtChkSttn.sttnExcelList,
+        "중수도시설 지도점검 현황",
+        "sample_rswtChkSttn.xlsx",
+        "A1:X2",
+        3
+      );
+    }
   }
-}
 
   return (
     <ContentsDiv>
@@ -126,9 +131,9 @@ const excelDown=() =>{
                   selectClass={""}
                   selectArray={rainChkSttn.fcltDiv}
                   onSelectValue={(val: string | number) =>
-                  setSelFcltDiv(String(val))
-                }
-                value={selFcltDiv ?? rainChkSttn.fcltDiv[0]?.val}
+                    setSelFcltDiv(String(val))
+                  }
+                  value={selFcltDiv ?? rainChkSttn.fcltDiv[0]?.val}
                 />
               </div>
             </SearchFormLeft>
@@ -143,7 +148,7 @@ const excelDown=() =>{
                   >
                     조회
                   </Button>
-                  <Button color="green" size={"sm"} onClick={(e) =>{excelDown()}}>
+                  <Button color="green" size={"sm"} onClick={(e) => { excelDown() }}>
                     다운로드
                   </Button>
                 </div>
@@ -157,15 +162,15 @@ const excelDown=() =>{
           <ListDiv>
             {selFcltDiv === "RNB" ? (
               <RainChkgdTable
-                deleteData={() => {}}
-                detailUp={() => {}}
+                deleteData={() => { }}
+                detailUp={() => { }}
                 handleClick={handleClick}
                 rainChkData={rainChkSttn.rainChkRes}
               />
             ) : (
               <RswtChkgdTable
-                detaiRswtlUpdate={() => {}}
-                deleteRswtData={() => {}}
+                detaiRswtlUpdate={() => { }}
+                deleteRswtData={() => { }}
                 handleRswtClick={handleClick}
                 rswtChkData={rswtChkSttn.rswtChkRes}
               />

apps/wr/app/store/prfmncSttn/chkgdnSttn/rainChkgdnSttn/index.tsx

@@ -35,7 +35,7 @@ export type rainChkSttnState = {
 };
 
 type rainChkSttnActions = {
-  rainChkSttnInit: ( sggCd: string) => void;
+  rainChkSttnInit: (searchTxt: string, sggCd: string) => void;
   rainChkSttnSearch:  (searchTxt: string, sggCd: string) => void;
   isRainSttn:(isSttn:boolean) => void;
   getRainSttnExcel:(excelList:rainChkZodType[]) => void;
@@ -58,9 +58,10 @@ export const rainChkSttnStateExport: rainChkSttnState = {
 };
 
 const initFetch = async (txt: string | undefined, sgg: string | undefined) => {
+  const currentYear = new Date().getFullYear().toString();
   const rainRes = await getFetch(
     "wr",
-    `/reuseChk/rainy/` + (txt ? `${txt}` : "2024") + (sgg ? `/${sgg}` : "/0")
+    `/reuseChk/rainy/` + (txt ? `${txt}` : currentYear) + (sgg ? `/${sgg}` : "/0")
   );
   return rainRes;
 };
@@ -68,9 +69,9 @@ export const rainChkSttnActionsExport: (set: any) => rainChkSttnActions = (
   set: any
 ) => {
   return {
-    rainChkSttnInit: async ( sggCd: string) => {
+    rainChkSttnInit: async (searchTxt: string, sggCd: string) => {
       try {
-        const rainChkRes = await initFetch(undefined, sggCd);
+        const rainChkRes = await initFetch(searchTxt, sggCd);
 
         return set((state: rainChkSttnState) => ({
           ...state,

apps/wr/app/store/prfmncSttn/chkgdnSttn/rswtChkgdnSttn/index.tsx

@@ -24,10 +24,10 @@ export type rswtChkSttnState = {
 };
 
 type rswtChkSttnActions = {
-  rswtChkSttnInit: ( sggCd: string) => void;
-  isRswtSttn: (isSttn:boolean) => void;
-  getRswtSttnExcel:(excelList:rswtChkZodType[]) => void;
- 
+  rswtChkSttnInit: (searchTxt: string, sggCd: string) => void;
+  isRswtSttn: (isSttn: boolean) => void;
+  getRswtSttnExcel: (excelList: rswtChkZodType[]) => void;
+  rswtChkSttnSearch: (searchTxt: string, sggCd: string) => void;
 };
 
 export type rswtChkSttnType = rswtChkSttnState & rswtChkSttnActions;
@@ -40,16 +40,17 @@ export const rswtChkStateExport: rswtChkSttnState = {
     sttnExcelList: [],
     rswtChkRes: [],
     isInit: false,
-    isSttn:false,
+    isSttn: false,
   },
 };
 
 const initFetch = async (year: string | undefined, sgg: string | undefined) => {
+  const currentYear = new Date().getFullYear().toString();
   const rswtChkRes = await getFetch(
     "wr",
     `/reuseChk/reuseWater/` +
-      (year ? `${year}` : "2024") +
-      (sgg ? `/${sgg}` : "/0")
+    (year ? `${year}` : currentYear) +
+    (sgg ? `/${sgg}` : "/0")
   );
   return rswtChkRes;
 };
@@ -59,9 +60,9 @@ export const rswtChkSttnActionsExport: (set: any) => rswtChkSttnActions = (
   set: any
 ) => {
   return {
-    rswtChkSttnInit: async ( sggCd: string) => {
+    rswtChkSttnInit: async (searchTxt: string, sggCd: string) => {
       try {
-        const rswtChkRes = await initFetch("2024", sggCd);
+        const rswtChkRes = await initFetch(searchTxt, sggCd);
         return set((state: rswtChkSttnState) => ({
           ...state,
           rswtChkSttn: {
@@ -73,35 +74,50 @@ export const rswtChkSttnActionsExport: (set: any) => rswtChkSttnActions = (
       } catch (error) {
         console.log(error);
       }
-       },isRswtSttn :(isSttn:boolean) =>{
-         try {
-           return set((state: rswtChkSttnState) => ({
-             ...state,
-             rswtChkSttn: {
-               ...state.rswtChkSttn,
-               isSttn:isSttn
-             },
-           }));
-         } catch (error) {
-           console.log(error);
-         }
-       },getRswtSttnExcel: async (excelList:rswtChkZodType  []) => {
-             try {
-       
-               const excelData = buildingExcelRswtSttn(excelList)
-       
-               return set((state: rswtChkSttnState) => ({
-                 ...state,
-                 rswtChkSttn: {
-                   ...state.rswtChkSttn,
-                   sttnExcelList:excelData
-                 },
-               }));
-             } catch (error) {
-               console.log(error);
-             }
-           }
+    },
+    isRswtSttn: (isSttn: boolean) => {
+      try {
+        return set((state: rswtChkSttnState) => ({
+          ...state,
+          rswtChkSttn: {
+            ...state.rswtChkSttn,
+            isSttn: isSttn
+          },
+        }));
+      } catch (error) {
+        console.log(error);
+      }
+    },
+    getRswtSttnExcel: async (excelList: rswtChkZodType[]) => {
+      try {
 
-  
+        const excelData = buildingExcelRswtSttn(excelList)
+
+        return set((state: rswtChkSttnState) => ({
+          ...state,
+          rswtChkSttn: {
+            ...state.rswtChkSttn,
+            sttnExcelList: excelData
+          },
+        }));
+      } catch (error) {
+        console.log(error);
+      }
+    },
+    rswtChkSttnSearch: async (searchTxt: string, sggCd: string) => {
+      try {
+        const rswtChkRes = await initFetch(searchTxt, sggCd);
+
+        return set((state: rswtChkSttnState) => ({
+          ...state,
+          rswtChkSttn: {
+            ...state.rswtChkSttn,
+            rswtChkRes: rswtChkRes
+          },
+        }));
+      } catch (error) {
+        console.log(error);
+      }
+    },
   };
 };