From 767553264cf06ece9f26e22f43cdd205523e3255 Mon Sep 17 00:00:00 2001 From: mjkhan21 Date: Thu, 25 Sep 2025 14:22:53 +0900 Subject: [PATCH] =?UTF-8?q?=EB=82=A9=EB=B6=80=EB=85=84=EC=9B=94=EA=B8=B0?= =?UTF-8?q?=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../xit/fims/chongno/JasperController.java | 11 ++++++++--- .../webapp/WEB-INF/report/notice-a4.jasper | Bin 39132 -> 39824 bytes .../webapp/WEB-INF/report/notice-a4.jrxml | 9 +++++++++ .../webapp/WEB-INF/report/prenotice-a4.jasper | Bin 40285 -> 40654 bytes .../webapp/WEB-INF/report/prenotice-a4.jrxml | 8 +++++++- 5 files changed, 24 insertions(+), 4 deletions(-) diff --git a/src/main/java/cokr/xit/fims/chongno/JasperController.java b/src/main/java/cokr/xit/fims/chongno/JasperController.java index 98baa43..4519c39 100644 --- a/src/main/java/cokr/xit/fims/chongno/JasperController.java +++ b/src/main/java/cokr/xit/fims/chongno/JasperController.java @@ -129,10 +129,12 @@ public class JasperController extends AbstractController { userEmail = "poe307@mail.jongno.go.kr"; List inputStreams = dtlList.stream() .flatMap(dtl -> { + String taxNo = dtl.string("TAX_NO"); dtl.set("CRDN_YMD_TM", DataFormat.yyyy_mm_dd(dtl.get("CRDN_YMD")) + " " + DataFormat.hh_mm_ss(dtl.get("CRDN_TM"))) .set("ADVNTCE_DUDT_YMD", DataFormat.yyyy_mm_dd(dtl.get("ADVNTCE_DUDT_YMD"))) .set("issueYear", year).set("issueMonth", month).set("issueDay", day) .set("managerName", userName).set("managerPhoneNo", userPhoneNo).set("managerEmail", userEmail) + .set("napbuYm", isEmpty(taxNo) ? null : taxNo.substring(15, 22)) ; List files = crdnFiles.get(dtl.string("CRDN_ID")); @@ -201,13 +203,16 @@ public class JasperController extends AbstractController { userName = "박재현", userPhoneNo = "02-2148-1857", userEmail = "poe307@mail.jongno.go.kr"; - dtlList.forEach(dtl -> + dtlList.forEach(dtl -> { + String taxNo = dtl.string("TAX_NO"); + dtl.set("CRDN_YMD_TM", DataFormat.yyyy_mm_dd(dtl.get("CRDN_YMD")) + " " + DataFormat.hh_mm_ss(dtl.get("CRDN_TM"))) .set("DUDT_YMD", DataFormat.yyyy_mm_dd(dtl.get("DUDT_YMD"))) .set("DUDT_AFTR_YMD", DataFormat.yyyy_mm_dd(dtl.get("DUDT_AFTR_YMD"))) .set("issueYear", year).set("issueMonth", month).set("issueDay", day) - .set("managerName", userName).set("managerPhoneNo", userPhoneNo).set("managerEmail", userEmail) - ); + .set("napbuYm", isEmpty(taxNo) ? null : taxNo.substring(15, 22)) + .set("managerName", userName).set("managerPhoneNo", userPhoneNo).set("managerEmail", userEmail); + }); DataObject params = new DataObject() .set("thisYear", year) .set("thisMonth", month) diff --git a/src/main/webapp/WEB-INF/report/notice-a4.jasper b/src/main/webapp/WEB-INF/report/notice-a4.jasper index 2caa72d18294468f0b7bb5744b31e000f1c4b6b3..e8b16d30c0828ef564f5dbd7a1d44fb399a59fc7 100644 GIT binary patch delta 2291 zcmZvdZA_C_6vuD-v}|grx{_{SsiFaybpru)Lv1ZpS~nanQ<;lfCIb!7*1lm2l`@6u z5|@Bp93+kpxMYdb7+4cs$P%(8GbVlzk|p|K88b0^kxpYswrm+=_uSi_+b;cb&bhz; zIrsT<@AH%&Ce(vB)#JPL%WPo{A;cC8kd5@baed;1e&iq>tX#Ro%J2$8)G<0?E?g0R zIA!_s#y=ZcTK}jsJah)=DMy7{qxeaT2W8P0WHkx;e7-c(D1!NOuoF30BnSJLG1yR9 zq!VRDs(L!(DtN|w#Mj(;$V12KOY>B-gs80CV!z|<3zy1|3|yJLvpG&&E@AOGu)~8s z+oBM%EoQQ`#Y~pAn90%>HF|E*nPqXIrS!0-7%V^_o3bqkA=^SGOIyffX$yiSVy#g{ zYf0Z8Ep7W=RYU)7+smS>y_UtkcBp6CT`U%L*jRk0!_MNT9iZOhb)kC)tDD@Q4!d`< zc;D?{(d2eG>nUT^bx$3OPd(6G;f48jFLYn^0{P7g`%WD*uJXk_trpkZlEh!j5hYCJg{r!xT~ ztqH!wgytYT;#v?|{|eT#xHAOtYzW5gg`Bi9rY&Zp%jZsCnY;1fT)aPdX^3qTBKSVp zJ?4bDGpSN*ms4GMJEYgb??bv4ZiKWDwnEww*#@aQvLDiPs?sA-dzW2pqr21?XHHECb|bwWAp%|&!aX-zeL}JRC}@&(%4Baq?J8<73p~oR`+`j zL)sFXRMEuK*b_xx&fg&IsEWN}+Ry0Y(`yY^q5L0T*H@C0H}$=>>WdK3?6W&}XN|>R zb(wzGH;`j)k{;`i8*XL|z+#dv_J3q#`{g+r8xHJ!Lo~oQtkoq(<5l@88=byz=IF2d z_rkz_WR`#?mrFs={){rgYFT!p4wgw&^RrbwSLxTZ%`(qQ@(3FZP-y|Go<&$7Al)}q z(95OuC>ezW{aX+|FX3*4FG#o_VWET{AS{wFfN+(7z3`+{NKLYJ5Mi-|V+hR>jw4(x z;S|C(65d5vl7h7PqQN*1CVoe4ozUpHi~iocBBrUiSpxT02AY5yaDX45fUhDfmz^$z zFG9tyL*0asZzSMRgcjb(t*JYaZsc^Hp8rJLoSLHavXH>;WrP(Heu=OWDq;5gTG36&zBrl{3y~W%fMf=QK z$zyAMN$f)XkgC%Uv7W}|;GQ?`0=Ljt39ikz0^CF2GH`nTdT?9)TfklSF9P?~UkYw< z6SjMscEIXIQvtZ-W^CWmoC~XC&1K+THg5oz703hU3amBihg1ch$~OLNTvf_>gp&pN7f%Em?wz zca~D~Wc^iwSqSmWcL`=o*iSGAAs+7y!CVQy5}Yp}T&(UF(FI6hCoO>>z8jp5h8K@> zTqOFT5@&*Nv4j{R#EIg&(n?5k=}09j=o1&KRZ(uaRPhqD3CKcyVrE)5rSfF`If5%C uj1kP2@E*Ye37-)xl<+OVA_1-N(cg&TA0)o-cY{Y!JW385NJwSAQ + + + @@ -340,6 +343,12 @@ + + + + + + diff --git a/src/main/webapp/WEB-INF/report/prenotice-a4.jasper b/src/main/webapp/WEB-INF/report/prenotice-a4.jasper index 058eeccebb28f2433e2ab2ffc557a7220062f253..0caceefa52364ee8d6b85d838f5f6818b9434146 100644 GIT binary patch delta 2188 zcmZwGdrVtZ90%}wZy!A3U|kUgY!gstWEdVBFoCr^<`~GvV6y2*j5V1=>Eo8(K0-@b zjUCKIt2tZPLlba5*gs^ki7rNrGmCL%SxB5l{!n8yF&T3+x~MT4{r%3}e&^QopKs3j zoZs)p)K zcF51Xk3tstIwAM_aP_zk>z908=&A#9uZsSvio1QG_CZ$oF+Ki%$VEQRA4Azc)&n`m z$2Z1yz_>Ah84F{+uS! zH)eBhNV_7pWVw&+8{YpPheMRd<*36crWD1_&&&A;_Y%@x_+`qDSu0oEb6n7gKqdrEN>epv+Suv zN&lNhdc!z5Yn;p(C+`?1XN;5i^rwj*O$7(}muLA<#)p2w&L^wvpX2a<{&TW2t5+W0 zTYgEC%zHYzAIWHoaeU>Q{w3Ve`owZN@}Hi12aYd8+^Cp}JT7o{VFMFK;F zcMD7s7VF65Q+EB$xW2^Bx-{h~BMxKZFMgb(P*22S6;LuG;1 z_z%r*Mp-1R)*JA7mkDbGE)(+C(c6C`tfNX3Z{l}Q&ynAusg+6_L}@SKW`PF?w+M6- zHVTXqHVJ%@uvtgEL(@r8{zdcSo8}20)=RPSeZm$U+1zWl@6hxmt+k1U9|#=+{~&Y{ pn#Cv6E|7nH{JJ^>Zld;1j;ruHG`B=FNz$YS_WfP!SoiD2{{bHEV9x*m delta 2020 zcmZwGdu&Tl90%}wdwV^`W^^`hwVCHUX2wjnnld(HHqVfdWtL5{wzuuwZI^BBM5u`w z4v9zb$08BpwFZe~e<1uJB9ZV1i6HzT2*dE#!tZx#zthV8`SzU8?|1Iw^xP-irdM}N z*Hz~OEra0F^Rygw^5ApF!=V};dxa^SCt|G__F08(B zt$@sQ7ofYb+UZ^f`QE(-a=x}4(x+kdhKBv0H3zz<5Yp{Izv98Gef5+<+Ps);-g3wn zd_2vE;`5b2cJpz9UJT<3o+owe{Gek`ZUbJ&-+))X)sO@Ek>?}>$CW(y8+i9e20r01 zKR!>fAID+8EzzM%%Ezu&$Xd6P?Qvy*_xkZ_IRP7_7Qp_?0es({0Pas=qdn5y*elC< ztgER2vZtvEva)$SWM{J-@?EnH(%P~K(rDQR`LrbuG9g$3xiN^VjsehWGvb3?eQ zA+!+kQm7R2XJ|8IS?e-6FVfzcVhSDAB~{xUsHukopdO2z9MYxaa#xLYrBl-zt(7&^ zZtpH^IuhG-ICgR(cG4a@VX>2rm`SpFynhzZ`j1Uy%ie2BQUyPV>O~oEdX=Sw(=E4f z_@9@Arwr&V;SJ+&>XLbV(W;ek%Yrz&!ajvN23YriwIA4LxfizpCl6R=+ksTL-XKSL z*`~GYq7C@fsJW5*ZN>;WpXHxwtyRDCFUkU+pn^p)HDf{Tp|V6HHNJ5WPJdB#aC~(L zud*qp>q2TDjHS=inTR8faspwJz;T2l1kNN(7MMpkQeX+;D2^e#y}XswB3f$+Qv@1> zqXq6GOci*XFil`5;g~4S!rOO|juowU3Hd9leeA{=OLV*B*HoJz7JMO`DDV&ABtjG4 zP6_|s$pZNzj#hzlXn8tEzFnqD(hSjBML1QUhcHv%9>Qq?j}T55c%E=Z6z#BGrmLj< zf9HqA)J-@m+KQcz3A3We + + + @@ -204,7 +207,7 @@ - + @@ -348,6 +351,9 @@ + + +