From 221a9331f7e5e445a89a4bebd573b93b33a23f5a Mon Sep 17 00:00:00 2001 From: jyha00 Date: Tue, 8 Jul 2025 14:16:37 +0900 Subject: [PATCH] =?UTF-8?q?=ED=95=98=EC=88=98/=EC=A4=91=EC=88=98=EB=8F=84?= =?UTF-8?q?=EC=8B=9C=EC=84=A4=20=ED=98=84=ED=99=A9=20=EC=97=91=EC=85=80=20?= =?UTF-8?q?=EB=8B=A4=EC=9A=B4=EB=A1=9C=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 --- .../ruseFcltMng/fcltSttn/pbnstSttn/page.tsx | 2 +- .../ruseFcltMng/fcltSttn/rswtSttn/page.tsx | 8 ++++---- .../ruseFcltMng/fcltSttn/rswtSttn/excel.tsx | 8 ++++---- .../ruseFcltMng/fcltSttn/rswtSttn/index.tsx | 7 +++---- apps/wr/public/sample_rswtSttn.xlsx | Bin 10806 -> 10848 bytes 5 files changed, 12 insertions(+), 13 deletions(-) diff --git a/apps/wr/app/ruseFcltMng/fcltSttn/pbnstSttn/page.tsx b/apps/wr/app/ruseFcltMng/fcltSttn/pbnstSttn/page.tsx index e2d54d6f8..baafd8053 100644 --- a/apps/wr/app/ruseFcltMng/fcltSttn/pbnstSttn/page.tsx +++ b/apps/wr/app/ruseFcltMng/fcltSttn/pbnstSttn/page.tsx @@ -48,7 +48,7 @@ export default function PbnstSttn() { const [pbnRuseNm, setPbnRuseNm] = useState(""); const excelClick = useCallback(() => { - pbnstSttnSearch(true, "1", "20", ref.current, "", searchYear); + pbnstSttnSearch(true, String(pageNation), "20", ref.current, "", searchYear); }, [pbnstSttnSearch]); const cellCLick = useCallback( diff --git a/apps/wr/app/ruseFcltMng/fcltSttn/rswtSttn/page.tsx b/apps/wr/app/ruseFcltMng/fcltSttn/rswtSttn/page.tsx index ee7a344f8..d101200d7 100644 --- a/apps/wr/app/ruseFcltMng/fcltSttn/rswtSttn/page.tsx +++ b/apps/wr/app/ruseFcltMng/fcltSttn/rswtSttn/page.tsx @@ -137,11 +137,11 @@ export default function RswtSttn() { const excelClick = useCallback(() => { // 최신 검색 조건 반영 const con = getConValue(); - rswtSttnSearch(1, "10000", String(con), fcltNm, code.cityCd, code.sggCd); - }, [rswtSttnSearch, objSearch, code.cityCd, code.sggCd]); + rswtSttnSearch(true, pageNation, "20", String(con), fcltNm, code.cityCd, code.sggCd); + }, [rswtSttnSearch, objSearch, code.cityCd, code.sggCd, pageNation, fcltNm]); useEffect(() => { - rswtSttnSearch(pageNation, "20", String(getConValue()), fcltNm, code.cityCd, code.sggCd); + rswtSttnSearch(false, pageNation, "20", String(getConValue()), fcltNm, code.cityCd, code.sggCd); }, [pageNation]); return ( @@ -188,7 +188,7 @@ export default function RswtSttn() { size={"sm"} onClick={() => { const con = getConValue(); - rswtSttnSearch(pageNation, "20", String(con), fcltNm, code.cityCd, code.sggCd); + rswtSttnSearch(false, pageNation, "20", String(con), fcltNm, code.cityCd, code.sggCd); }} > 조회 diff --git a/apps/wr/app/store/ruseFcltMng/fcltSttn/rswtSttn/excel.tsx b/apps/wr/app/store/ruseFcltMng/fcltSttn/rswtSttn/excel.tsx index ac57a8016..d24671ee4 100644 --- a/apps/wr/app/store/ruseFcltMng/fcltSttn/rswtSttn/excel.tsx +++ b/apps/wr/app/store/ruseFcltMng/fcltSttn/rswtSttn/excel.tsx @@ -15,21 +15,21 @@ export const excelRSwtSttnParsing = ( sggCode.find((sgg) => sgg.val === item.sggCd.toString())?.text ?? "", item.bdstNm ?? "", item.daddr ?? "", - String(item.bdstUsgText ?? ""), + String(item.bdstUsgCd === -1 || item.bdstUsgCd === undefined ? "확인불가" : item.bdstUsgCd ?? ""), //건축물용도 String(item.frstArchPrmsnDt ?? ""), - String(item.archArea ?? ""), + String(item.archArea.split('.')[0] === '-1' ? '확인불가' : item.archArea.split('.')[0]), String(item.reuseBuilding?.[0]?.rswtrObj.wtrUsqty ?? "0"), //물사용량 String(item.chgBuilding.length > 0 ? "Y" : "N"), //중축・개축・재축여부 String(item.reuseBuilding?.[0]?.lawTrgtYn ?? ""), //법적의무대상여부 String(item.reuseBuilding?.[0]?.rswtrObj.oblgTrgtWtrUsqty ?? ""), //의무대상물사용량 String(item.reuseBuilding?.[0]?.instlCmptnDt ?? ""), //설치완료일시 - String(item.reuseBuilding?.[0]?.instlCst ?? ""), //설치비용 + String(item.reuseBuilding?.[0]?.instlCst === -1 ? "확인불가" : item.reuseBuilding?.[0]?.instlCst ?? ""), //설치비용 item.reuseBuilding?.[0]?.rswtrObj?.orgwtKndCd ?? "", //원수종류 String(item.reuseBuilding?.[0]?.rswtrObj.filtrTrtmfctCpct ?? ""), //처리시설용량 String(item.reuseBuilding?.[0]?.rswtrObj?.filtrTrtmfctProcs ?? ""), //주요처리공정 String(item.reuseBuilding?.[0]?.rswtrObj?.filtrTrtmfctUsgCd ?? ""), //이용용도 String(item.reuseBuilding?.[0]?.instlCstSprtYn ?? ""), //설치지원비용여부 - String(item.reuseBuilding?.[0]?.instlCstSprtAmt ?? ""), //설치지원비용 + String(item.reuseBuilding?.[0]?.instlCstSprtAmt === -1 ? "확인불가" : item.reuseBuilding?.[0]?.instlCstSprtAmt ?? ""), //설치지원비용 String(item.reuseBuilding?.[0]?.grntchBdstCertYn ?? ""), String(item.reuseBuilding?.[0]?.grntchBdstCertYr ?? ""), String(item.reuseBuilding?.[0]?.grntchBdstCertNo ?? ""), diff --git a/apps/wr/app/store/ruseFcltMng/fcltSttn/rswtSttn/index.tsx b/apps/wr/app/store/ruseFcltMng/fcltSttn/rswtSttn/index.tsx index 8fbe2c26d..8f0ac261a 100644 --- a/apps/wr/app/store/ruseFcltMng/fcltSttn/rswtSttn/index.tsx +++ b/apps/wr/app/store/ruseFcltMng/fcltSttn/rswtSttn/index.tsx @@ -31,7 +31,7 @@ type rswtSttnActions = { rswtSttnInit: (page: number, total: string, con: string, txt: string, sidoCode: SelectDataType[], sggCode: SelectDataType[]) => void; - rswtSttnSearch: (page: number, total: string, con: string, txt: string, + rswtSttnSearch: (isExcel: boolean, page: number, total: string, con: string, txt: string, sidoCode: SelectDataType[], sggCode: SelectDataType[]) => void; rswtChSttnHead: ( @@ -84,11 +84,10 @@ export const rswtSttnActionsExport: (set: any) => rswtSttnActions = ( console.log(e) } }, - rswtSttnSearch: async (page: number, total: string, con: string, txt: string, + rswtSttnSearch: async (isExcel: boolean, page: number, total: string, con: string, txt: string, sidoCode: SelectDataType[], sggCode: SelectDataType[]) => { try { - console.log("헐", page) const rswtSttnRes = await getFetch( fetchType.WR, `/reuseFc/waterreuseFc` + @@ -97,7 +96,7 @@ export const rswtSttnActionsExport: (set: any) => rswtSttnActions = ( (con ? `/${con}` : "/0") + (txt ? `/${txt}` : "") ); - if (Number(total) > 9000) { + if (isExcel) { const rswtExcel = excelRSwtSttnParsing(rswtSttnRes, sidoCode, sggCode); set((state: rswtSttnState) => { return { diff --git a/apps/wr/public/sample_rswtSttn.xlsx b/apps/wr/public/sample_rswtSttn.xlsx index f64b37ea34efcb3e8a75dfe170def88a3aeba7cd..d97a79b6de6b52df015f9960225de3d41cd5921a 100644 GIT binary patch delta 3865 zcmY+HXE+;-7RN)x-m9@{6RK(xYEvVvnNlOF_KsN;jn&wSST$pm8nrjIT60L0 zNTjQ1fV*2UMiIFvMvKN1UeOTYpQP-A(bhsvOU$Q6Leb3SYQ{;EO+ z-*`a5K?^KCT%?m#*!Oru9$#WJHZwbuTB=j3Uw9kmgpb)5srlLnuo|+*FZixK zcwhl8aVCnIK;y|9IJuemPQab6nmglCeJkO{qqolw(QLEaHiE@RrKE2)aKRtu`|EN) zHN5_E@Fsqn$(+n1K{6qqOPD31V;Ch1!-%jMi)JJw9Z99<)>K`L!;g4`l1KmCYdkWz z<(sG_*&Ro*=%4?B8z-GTRwDFhSlQ^CMfh;f;May;_k8KXVl?`68flPIZ$UKb=$sBB z6u2;aQIi$;gyo>NX`=iR$-x^m%L-4p49)*g6FNpeY$obuf8SBTedIZ*;V$M*jT$iE?yLz@SpkuK`-E3qPS@d#7K51Q8b&KRo#c z-cL5NkjL8kwADlfd|+xsQph7l4Fx5ZLx8o&5Y=0p%*|7HkbEL>TeQMdE&uJ_7CX6! zXHQ9Hg=$+>K346&LwH{&NDfh{Q>-#8#lKI^8ECkq!V~}*$zovNGRX-6fHRB`1skdu z-s3T&Li>RiM>DrvrcOhebZ}dk+iL^BY0d9pD`Xb+gLuk9mwpqH3<;-gZsaa}`)*L% zV-FrPxZ-)DcOB*&Pw49oFKb@Pl|`G9v*4g7+G!ge056d3UlxPUaQw{soU57%bT$GVdvMYenth??eo`3ln&aXE574mfYWeZ6aNxs5*oM2yno*Y@Nfp*fV+pqOiMG@7Z zKSWolq~YM|QE_|zJy!;5JgQjO&tY<}%A6ovD2Iq1H8D}wz9Wbs4T6Q2rkO8inDCY! z(;u4edH)!HK}uOfxyC~w+<(}cZ3PPr@K1mE_VCj9{dk$&*Z5LAa$dgns(x>_)0>yNCkX_uPyuU0sdKy zdIhRU5|C9GlR^}RmWdTL=CL6|+j(nOfwV*6ymo5=z11fl6AEh53@cWtZg}|RlToqi zlvz+5;RQKGLo@SkfeI%UIlI)U9+hf0aw^bNpU5B+rG0sEM&*d+8JI!U4rcnm?DRmd zlTh2-QAZl_LirlI7uhXSs(MvooVEgTF_S5qyM3$s)#t6|65c39ehny~=Y;f8TGpwh ztbPgK$3Jf}>8S6PC9#+oq%z3n>x2)q-cA*lJ?d!6el~0vHaU_Kq9P%(GU}M1VJBI+ z8!b_uPD}wcn+}p*Q(LD4mQ!@SVsKn*wl^5FE^iVTa^lexHS#0IR%sh&CAn82n)lc3 z5{PPO)Q{EYDacVhBv)|HG=-Q}}4Q%cJkj`0*9g)irMCsjqRYQ-q5+*2%?}av#B)mo%$6)i^<0}Vf z1pk)xPmrtA*DpalxM`Z+E0WFdsalhR&0dI+-UGVWjl-kfE_qooX$Ny@^sB&7F<$P0 z)rPb+A_6WZzX&DXGQuSt`8Ru|^pa=F^txeQH0QRlg5kC$vxtOuuZfT(1Bppl;kG6w zCMj`a`P`^dL7|-mpU5@a-5*duv}p&P-H`N;3JXmC_%}VW=!AMm=KPS}rRe0=kWckE zd3z0v4)6K$l7HFv-Gu13@7h1|t^>0+RYjZJyKX8tHi_1Ao$dveU)>a2Z0#|$E#md? zO!5opyp7Ubxoz77JLVkr+y2=~+Qy5_*8z@&f?}vo#9XGc4-2#QMRTnWWNH1Xja9KJgr`NB2iND*G>&VMv%aC#>;(@={Y1s22rd~(a zDuXUmOxZ^`>xj7IuH0~&l+?3Wzd!s%40*{m-PqR^g_2Auoj@**WnFBpc5zWktiWkj zGyR0eVDH0HQ@7;h4|D#w`P%LT>Du@%WIG|(3+Gm1-^@7|hPs@t)BTmYrBJm+kduXI z=mE1`JHZzZWyB)K*|+BetNwoNG<2TTwH5%>VhC3a0vL8+%Cab1u+v2HhL)5_(Iq)8 zp=DTDZG9J>L3(wvHm{HBs6J3Hg4)L(Pke#{d^(h6%eIU93f_AC?E!R3@? zKemmW`?-=Np6giSllq~vs9B9An)LljoYmc29l%uVJk(CNd*%&{wSco4y|Xk@A?Jkh z?RZu?<&sh}MHQ8iP~#`w(GlNnwTife!=9Xn`|@KfLEQ9Rvm-2g(nCfIDVL{hqH2x3 zuDMVfiC9Z4VrQA^>+;AXp4DsSgzde|p_KfA!$P#Wa*JCt+VmOwTuT(q!=z)&m1_E8 z=9de`QoQlUx~6I9y+$k_WSKXTxsTMT7vWe%bq)IWZ0&Zaxj!NT0Aw)(EZnFO?{#_F zrIqqOBpLXK+G7pSL%Q2xe6;l1bute^?=)@QiMzkOkAz9cGz3>Th-ZiDC+fkLv<^zH z_V2{x(g++!mvYP_r4UhXxu0r%Z`$Y-(NeBP2xh3ZQQPFzC0>kq<4y4c$_M(Q%O@PR z(*&=iezqtGN$v#(w%F<<$p)bMjm{>}aePTfkS41s3yM5#l;0UZU?0sn{^}C11`JR$(H2>mId| znuzCIj40FeMl`*w*~CB?@9(gE0YE3*J}dc*xCUZByI1qdh3U5QE|j1)eg~gF-+r;w zG(O?_N$I5MXCkEu1#`VYopkDuAN<@jr|Zr-5mo@QorPtLFnGXOIkDcdp+^Qkddgv| zy9*yU8s=JhetJdgS?nrvYdp(6JVYe_&rYW1Vs7N1DU~;Yv%wea{!fAtbqFvL2@m2V zlGtqm-S}b)Yi93Lq$;C=b;m8W;u=`7bca4e7^5?kM*D%m(63azfe*eMr0E~cl-oAz z4nn$re+>8b!KzT7W+@R9gTXe|kzp2;@#11V-5kV+;z!n@cOJWcm?R4-RaQ9Tyh?64n7wJd`Y{xZPX^JRwy zJv`1DY^sIE8K(Q8zPD^Hz?F3OD+O?n>eteYsSANrAp75C4qcGO3G_NAo}QE6-_W!C zPMb*5hQeM^B&v%sXD_AGd@x%zx-)ed*BH9(goulCofUFzKPV6{w{IIum;I{sxU;MP zD}krls_QrbQc{YG^>*JS?gwXDuTlf?-~h31!wM-t+1Hs$x#hrF*1L8d-1;DILusvu z?v-*`o{D>vTbG&PIh~aST%}!~4U%S_Qh{8a9)O@6C^YDCK#j3xS&m1Jz16{XNRC+T zEQ9J{WN`KJ7f;*v19}GZh z2P1Qh(tya-Z+Aqh>DS@-3nmTSf*(RGmD##@8AUl(t+t{(6c&5j?iJBK=%mtrnY%gw2TAgSu-i5cBm5mfU z((md|4M;_;V-;WCAMKPKex~=6vc!$VvW{>3VbF*Ueu#WshktS;;|DCERbEqj_73XU z_XhZnzks;sE|41ay0`fVP?0H5VIRd9`&K|*>O(=<4YRGUnt*AFP}*+>!4yMFCT`P7 z8toxLGs+cdWJ=q4J}CS*SlyPPNzW~?#hkE~mxci#cD@jP!R{_w;h9LdpGjX?&a}Bp z#C$hyzarjs*cCWYGG}c`CUeARFEkI8mn#+OPv=yTU<-^oUayj&PJ!M?1y!=#SO;~J zaZ6$@IF(Qhacd_7XYNWDRK{_Ve<#&xJ4 zu~T;lMf|u;%yXpb#CcKKQ9|=Nn@N~Hk%MyQ$ znei`O{x8@mFrpO97zKzh;S(y14i!Hp9wJO&j%kJnu>bpE{_VIC005}|*YY=mFk${c zINAT}^?$42{}X&=!Hlx7V)TS)+5R2aU$Qm(%QAHTCqiHXg_H;vxG=+9LYQ?SVFD`* Nl`tN8?1I~l98urmU+-{QkPC6R>7|RN2uWE0k z1xM1FZjYe%w|7fJlL}hsVgV#ZLj1T#YQ#j$>O)rt>2M2&%80(#M43gUrGEkdvDUtM zg25FXvLXELTXIYev*vwoI0|UlXp@0BpxUBBWakamtCfEeI72*t4C zPzR2~04q&$dyD=7xi56H5-!$l;@RY-Wp_A;q0=9~#bvv$cl5DIKg-gL0#A_3lS$O= zi_R|d5=1mYtN@7%5?5I9E& zI@b@PIx_i$7`2mxAZ{l7Iws62B#-HS$ad-M$0q(BogP);+{4C~o{9T^$(+*58{uQb z_yzUYLjI7_UTIm3ueql8WGrup524t=od@;pn{IcD|5*32oERJ5rB-*1D#Hf{I_u_$ z2Ijs`aIkt~<9lp^6ne3uh-3a^j&O4TX7^HIOMvVb)%a^)texM3NE!fu9e_23a-vf$ zCooeQ?5NAfNz&WG^WYbm?hu+@4R!uzlKi-_w+IJnonUEikJR;P>Uu1>)!E1@Kr}H* zIpJBn*><)R0t{U|(wvKn2Z7n+H5ml!H9 zk00BTr>!&!SCELN(!czrVCO!!7GdX3v z!B|AR+zo;37%V&FpqOcVJy`20ievUO@?&4WvpHfLYedH^Sdz`18~L-+svv%fYAhAg zP8yYG0oM-=3-n`8`Ll4U^i5vx!iEqyvcJ za0LO8YC25YoIdF7KW6+}{U(nK<8&a#`mz_vSY-}w^xXiWJPR69zs6k$D~6`y}j-Wh!{mm2|F67xB^0#+mK%+j$4_;E>`%Y+}2|g z4SHJ5#{UB&Th1^yKnU%UgwJHfY@9$3OV&Z?gr&HLV(lXZIv+YPW^6Bg#^203b}u*Z zQ5O`u&J-8*hStL33IQE)53fDTNRRzUYloWe57fh4DLRcjJM32`7xk(?JlYIX&H9?! zcn@~pn&-wpO)}u93eOI16PzE-Rq^zX%Hs;bSkdfTcs+*pF5RAM^S5YLh-EOX6@HF; z=vS>%x`V~cdS%JqV5v$gl+Qu54kK?D7^kJ1gZFg4mP6wINDYBX-Ch%hbMKVpr(R

QT2z`wCgu-{3OtJBTGHlhUl`HL;zLu!;mL}Tx zrw;N%b7u|5?|+sym++U&Es!5ZMhuY+hiI84S#0KDp*RyC&~pp~=zjNxjL{m38nKPc zY|9Df!G;;M!oqUQc(A>Og$|+C_yi|RJBZRB@Uuc26-Y{_b5;0L>6IB4)Zq8$q+)?z zpJm%%J99Ad4D#Em16LbgTfM zMYs0VqC)yrKdwP#d&mb(KIQ7;?a1(U{Db}z$_~?35WCvAf6lB&dxA)OgAvN<^p=wo zF0|9*sZw+yE;kaE&f-2DVqYE^?-PA!`=v7_u_tY|ilf=bJ#O{Qccql(Z;75Vtx_{_lPOH(15X#%63w&}eK0+``K~eYuzdU7r~*6P?*4r^3VaFrYZK+PqJe z21lIqYrm||yXsoOKbEpp``u5&ALw!>7A!RAMpB&7H3y;TNbSn(P4sBcammU7F`J~` z!rObw>C$v|G(!himqSF+@Ay5T>eukxWbq{I_RsvPn$L*%nKAVYSb-;^W91cOt;H-+=X?hDD!W!N#uqorD<-rw zn`^{fa#u33a-Nc+h`t}v?NT}6omoF|A&Hz;A1be+{-n!!so=z3-1Z0)BxK*G-#OXTUN{B*H7ADD zAx7w(^JnQk_U9D=G%@I_A`5D<`h+fLktM_K&4-r~=Dt=uLUvDW%TsTxRZ1dX>g&hZyl*~bEO34u; zge?W^*4U>-bcjcUyM3`SP|I`xWXEWKZJb5(4O-l@ZKXuhI~PUs^t zA3e5W*Z)D}3M~*UBl(T!)?-{2@1E+i@cBMx9*t&Ah&AfDBPUH>c|?fvk2GPH2(@3Q ze^5NNMc?X$?s6)Ulya<_x_KCpg0ECL+!DxupWNz#+ol zkGjU(>Gc7%K4~|%9u~*Kjdo1w;B4=*?222KEhf>(t8S%Le(_ON;pT*svMSJe^l+;XJQ6t3lwf@0Te(JRMQV**x?}#gr}wI+CA+{3X*X3KZr<1IILne$y5 zKJMI+`(k63QN||*HDG*l3pCRDN(mwqnQ2kn%PR_PFy%-$^C%LBLR+T5;E_!u-F9e4 zQ~uZfvBBLUhiY3X-;T)=&<@V-8`i}|u6t}=tGzbyGHK0jM3 zy5a6EAO&)*eb+6uYC!oF^K_Dodm(d)ze=iF(O|vKidS&2Ef$FS72asDIhr4gu67Ty z>-AOWB z52|-0OWO2OhTu=k%&Pq=O`-HN19b7R{(jL0(4pCZZF&#~@!*-+cx{>~1L)q|0b@yV z9p;1;T!0(69Ith^{^z95n8Tg)BwkCvDxa|gD|Y1IFUyfEiO(46{|?51mVganP)i`3nZ_fwd0IUh*9B3c)h9+*H)O@bw}Q7 zMH1_BsK-0T%-GrD4;(hq5Wb!VJKhLs`X8EXDuJN~(2Y;I1W!1pyYYuRrFWNj4RcfI z6D=qb_q(oKHl%qIeLK)ygs)u<6Yi2G71TM! zoZ||?Z+7_x_?4SseYJH)37c*6NL`(It!Ui^mFM;(vn`3x{e_-N0r*&8VcX%TQsFfB%!`zI`SP09^P__cu6U{}(iaLn3_d1!G-A z*m?f*_;VrG|7q*7PNL#G|JLUmPwc1xfJ^_ku7E8SRim!u$Nu6M#WIPBQORNz#IDmG JogWGS{0|&y9pnH2