물재이용사례관리, 통계 결함조치

apps/wr/app/matMng/coMat/ruseCaseMng/page.tsx

@@ -5,6 +5,7 @@ import { ruseUtzType } from "@/app/store/matDmd/ruseCaseMng/headList";
 import { excelDownload, getCity } from "@/components/lib/func/commom";
 import RuseCaseMngExcel from "@/components/ui/modal/coMat/ruseCaseMng/ruseCaseMngExcelModal";
 import type { objSearchType } from "@/components/ui/modal/fcltReg/bdstRegModal/bdstRegModal";
+import { ToastFormUi } from "@/components/ui/toast/toastFromUi";
 import {
     ContentsDiv,
     filePickedBlobArray,
@@ -20,11 +21,12 @@ import {
 } from "@common/business_components/ui";
 import ListDiv from "@common/business_components/ui/list_div";
 import { Button } from "@common/components/ui";
-import { useState } from "react";
+import { useEffect, useState } from "react";
+import { toast, Toaster } from "react-hot-toast";
 
 export default function RuseCaseMng() {
     const { code, ruseCaseMng, selectRuseCaseMng } = useWrStore((state) => state);
-    const { ruseCaseMngList } = ruseCaseMng;
+    const { ruseCaseMngList, status } = ruseCaseMng;
     const [selectSgg, setSelectSgg] = useState<SelectDataType[] | []>([]);
     const [objSearch, setObjSearch] = useState<objSearchType>({ sgg: "", city: "" });
     
@@ -142,7 +144,7 @@ export default function RuseCaseMng() {
             }
           ];
           // 버퍼에 있는 엑셀데이터 전달 후 json으로 변환
-          await filePickedBlobArray(blobRet, '시설정보및운영현황황', sheetParameter);
+          await filePickedBlobArray(blobRet, '물재이용사례현황', sheetParameter);
         });
     }
 
@@ -157,6 +159,12 @@ export default function RuseCaseMng() {
         );
     }
 
+    useEffect(() => {
+        if(status === 200){
+            setIsExcelOpen({ isModal: false });
+        }
+    }, [status]);
+
     return (
         <>
             <ContentsDiv>
@@ -239,7 +247,7 @@ export default function RuseCaseMng() {
                     </div>
                 </div>
             </ContentsDiv>
-
+            <Toaster position="top-center" />
             {/* 엑셀 등록 모달 */}
             <UiModal
                 open={isExcelOpen.isModal}

apps/wr/app/stats/rainStat/page.tsx

@@ -210,8 +210,9 @@ export default function RainStat() {
           ...item,
           ctpvCd: item.cityText
         };
-      })
+      }).filter((item: RainStatProps) => item.cityText !== '없음')
       : [];
+
     setBdstTable(tbData);
   }, [code, rainStatList]);
 

apps/wr/app/stats/rswtStat/page.tsx

@@ -46,7 +46,7 @@ export default function RswtStat() {
           ...item,
           ctpvCd: item.cityText
         };
-      })
+      }).filter((item: RswtStatProps) => item.cityText !== '없음')
       : [];
     setRswtTable(tbData);
   }, [code, rswtStatList])

apps/wr/app/store/matDmd/ruseCaseMng/index.tsx

@@ -1,12 +1,12 @@
 import { fetchType, getFetch, postFectch } from "@/components/lib/api";
 import type { TableUpperProps } from "../../common/type/header";
 import { ruseCaseHeadListExport } from "./headList";
-import { ToastFormUi } from "@/components/ui/toast/toastFromUi";
-
+import { toast } from "react-hot-toast";
 export type ruseCaseState = {
   ruseCaseMng: {
     ruseHeadList:TableUpperProps[];
     ruseCaseMngList:ruseCaseMngExcelProps[];
+    status: number;
   };
 };
 
@@ -69,7 +69,6 @@ type ruseCaseActions = {
 };
 
 export const fetchSearchRuseCaseMng = async (sidoCd: string, sigunguCd: string, usageCd : string, name: string) => {
-  
   const tailUrl = ((sigunguCd !== '전체' && sigunguCd !=='') ? `/${sigunguCd}` :  (sidoCd != '전체' && sidoCd != '') ? `/${sidoCd}` : `/0`) + (usageCd? `/${usageCd}` : '/0') + (name? `/${name}` : '');
   const resp = await getFetch(fetchType.WR,`/reuseFc/pubFcRuseCase${tailUrl}`);
   return resp;
@@ -77,7 +76,7 @@ export const fetchSearchRuseCaseMng = async (sidoCd: string, sigunguCd: string,
 
 export const fetchInsertRuseCaseMng = async (data: any) => {
   const response = await postFectch('/reuseFc/pubFcRuseCase', data, fetchType.WR);
-  return response.data;
+  return {data:response.data, status:response.status};
 };
 
 export type ruseCaseType = ruseCaseState & ruseCaseActions;
@@ -86,6 +85,7 @@ export const ruseCaseStateExport: ruseCaseState = {
   ruseCaseMng: {
     ruseHeadList:ruseCaseHeadListExport,
     ruseCaseMngList:[],
+    status: 0,
   },
 };
 
@@ -95,7 +95,6 @@ export const ruseCaseActionsExport: (set: any) => ruseCaseActions = (
   return {
     selectRuseCaseMng: async (sidoCd: string, sigunguCd: string, usageCd : string, name: string) => {
       const res = await fetchSearchRuseCaseMng(sidoCd, sigunguCd, usageCd, name);
-      console.log('res : ', res);
       set((state: ruseCaseState) => ({
         ruseCaseMng: {
           ...state.ruseCaseMng,
@@ -107,11 +106,16 @@ export const ruseCaseActionsExport: (set: any) => ruseCaseActions = (
     insertRuseCaseMng: async (data: any) => {
       const response = await fetchInsertRuseCaseMng(data);
       if(response.status === 200){
-        ToastFormUi({
-          body: "잠재수요처 등록이 완료되었습니다. ",
-          title: "잠재수요처 등록",
-        });
+        toast.success("물재이용사례 등록이 완료되었습니다. ");
+      }else{
+        toast.error("물재이용사례 등록에 실패하였습니다. ");
       }
+      set((state: ruseCaseState) => ({
+        ruseCaseMng: {
+          ...state.ruseCaseMng,
+          status: response.status,
+        },
+      }));
     },
   };
 };