Merge commit '5bc4de6d8a7225b3c5815cfa79f16d5d6d13c423' into iipbs/fo/dev

apps/dm/components/ui/sdmInfoInsertForm/component.tsx

@@ -896,7 +896,7 @@ export function SdmInfoRegForm({
                     <div className="relative flex-1 min-w-0">
                       <Input
                         type="text"
-                        className="w-full pr-16 border py-2 text-right rounded-md"
+                        className="w-full pr-16 border py-2  rounded-md"
                         placeholder=""
                         onChange={(e) => {
                           field.onChange(e.target.value);

apps/wr/app/(with-layout)/ruseFcltMng/prfmncReg/pbnstPrfmncReg/page.tsx

@@ -209,8 +209,9 @@ export default function PrfmncPrfmncReg() {
   useEffect(() => {
     const year = new Date().getFullYear();
 
+    if(laeSeCd === undefined || laeSeCd ==='') return;
     prfmncHasuInit(1, laeSeCd, String(year), prfPbnFclts);
-  }, [prfPbnFclts]);
+  }, [prfPbnFclts,laeSeCd]);
 
   useEffect(() => {
     if (prfmncRes && prfmncRes.length > 0) {

apps/wr/app/store/common/type/header.tsx

@@ -24,5 +24,6 @@ export type TableUpperProps = {
     mergeCell?:boolean // 셀을 합칠경우
     maxLength?:number
     readonly?:boolean
+    commonCode?:string // 공통코드 사용할경우
   };
   

apps/wr/app/store/prfmncReg/pbnstPrfmncReg/index.tsx

@@ -75,7 +75,6 @@ const hasuListFetch = async (
         : fclt.slice(0, 5) === sggOrCity;
     });
   }
-
   let url = `/prcsFclt/ruseInfo/1/${filteredFclt.length + 1}/A/${sggOrCity}/0/1/SW`;
   if (searchTxt && searchTxt?.length > 0) {
     url += `/${searchTxt}`;
@@ -121,7 +120,6 @@ export const pbnstPrfmncActionsExport: (set: any) => pbnstPrfmncActions = (
     getPrfFmcRes: async () => {
       try {
         const pbnPrfRes = await getFetch(fetchType.WR, "/reuseFc/pubFc");
-        console.log("pbnPrfRes ", pbnPrfRes);
         set((state: pbnstPrfmncState) => ({
           ...state,
           prfmnc: {
@@ -140,7 +138,6 @@ export const pbnstPrfmncActionsExport: (set: any) => pbnstPrfmncActions = (
       prfPbnFclts: string[]
     ) => {
       try {
-        console.log("prfPbnFclts ", prfPbnFclts);
         const prfmncRes = await hasuListFetch(
           page,
           sggOrCity,

apps/wr/app/store/stats/rainStat/headList.tsx

@@ -40,36 +40,43 @@ export const rainStatHeadListExport: TableUpperProps[] = [
   {
     id: "lndwtr",
     title: "조경용수",
+    commonCode : "01",
     row:1,
   },
   {
     id: "cleanToilUswtr",
     title: "청소화장실용수",
+    commonCode : "02",
     row:1,
   },
   {
     id:"resn",
     title:"세척살수용수",
+    commonCode : "03",
     row:1,
   },
   {
     id: "farmUswtr",
     title: "농업용수",
+    commonCode : "04",
     row:1,
   },
   {
     id: "indstUswtr",
     title: "공업용수",
+    commonCode : "05",
     row:1,
   },
   {
     id: "hydUswtr",
     title: "친수용수",
+    commonCode : "06",
     row:1,
   },
   {
     id: "ithlEtcUswtr",
     title: "기타",
+    commonCode : "07",
     row:1,
   },
   {

apps/wr/app/store/stats/rainStat/index.tsx

@@ -89,8 +89,6 @@ export const rainStatActionsExport = (
     searchRainStatList: async (year: string, city: SelectDataType[]) => {
       const res = await fetchRainStatList(year);
       const cityArr: any[] = [];
-      
-      console.log('res ', res)
 
       res.filter((resFilter: RainStatProps) =>
         city.some((cityCd) =>
@@ -116,14 +114,20 @@ export const rainStatActionsExport = (
             obj.dtfcltCpct = item.dtfcltCpct;
             obj.wtrUsqty = item.wtrUsqty;
             obj.anlOperCst = item.anlOperCst;
-
+            obj.lndwtr = 0; //조경용수
+            obj.cleanToilUswtr = 0; //청소화장실용수
+            obj.resn = 0; //세척살수용수
+            obj.farmUswtr = 0; //농업용수
+            obj.indstUswtr = 0; //공업용수
+            obj.hydUswtr = 0; //친수용수
+            obj.ithlEtcUswtr = 0; //기타
             cityArr.push(obj);
           }
 
           if (item.guideStats && item.guideStats.length > 0) {
             item.guideStats.forEach((guide: GuideStatProps) => {
               rainStatHeadListExport.forEach((headItem: TableUpperProps) => {
-                if (headItem.title == guide.utztnUsgCd) {
+                if (headItem.commonCode == guide.utztnUsgCd) {
                   if (!obj[headItem.id] || typeof obj[headItem.id] !== "number")
                     obj[headItem.id] = 0;
                   if (typeof obj[headItem.id] === "number") {

apps/wr/app/store/stats/rswtStat/headList.tsx

@@ -64,31 +64,37 @@ export const rswtStatHeadListExport :TableUpperProps[]=[
       {
         id: "lndwtr",
         title: "조경용수",
+        commonCode: "01",
         row:1,
       },
       {
         id: "cleanToilUswtr",
         title: "청소화장실용수",
+        commonCode : "02",
         row:1,
       },
       {
         id: "farmUswtr",
         title: "농업용수",
+        commonCode : "04",
         row:1,
       },
       {
         id: "indstUswtr",
         title: "공업용수",
+        commonCode : "05",
         row:1,
       },
       {
         id: "hydUswtr",
         title: "친수용수",
+        commonCode : "06",
         row:1,
       },
       {
         id: "ithlEtcUswtr",
         title: "기타",
+        commonCode : "07",
         row:1,
       },
       {

apps/wr/app/store/stats/rswtStat/index.tsx

@@ -118,10 +118,9 @@ export const rswtStatActionsExport: (set: any) => rswtStatActions = (
                     item.guideStats.forEach((guide: GuideStatProps) => {
                         rswtStatHeadListExport.forEach((headItem: TableUpperProps) => {
 
-                            if (headItem.title == guide.utztnUsgCd) {
+                            if (headItem.commonCode == guide.utztnUsgCd) {
                                 if (!obj[headItem.id] || typeof obj[headItem.id] !== "number") obj[headItem.id] = 0;
                                 if (typeof obj[headItem.id] === "number") {
-
                                     obj[headItem.id] += guide.ruseFcltUtztnQnt;
                                 }
                             }