From c0df066fe960086d849c4098d7ebd8532d0bc382 Mon Sep 17 00:00:00 2001 From: "alexandre.lima" Date: Mon, 26 Feb 2018 21:40:02 +0000 Subject: [PATCH] Fixes Bug #10597 - Teste feito pelo Marcelo e Code review feito pelo Valdevir git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@79203 d1611594-4594-4d17-8e1d-87c2c4800839 --- .../relatorios/impl/RelatorioGratuidade.java | 4 +++- .../templates/RelatorioGratuidade.jasper | Bin 59381 -> 59493 bytes .../templates/RelatorioGratuidade.jrxml | 5 +++-- .../utilitarios/RelatorioGratuidadeBean.java | 19 ++++++++++++------ 4 files changed, 19 insertions(+), 9 deletions(-) diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioGratuidade.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioGratuidade.java index 1d625442c..034a9e954 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioGratuidade.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioGratuidade.java @@ -99,6 +99,7 @@ public class RelatorioGratuidade extends Relatorio { lsDadosRelatorio = new ArrayList(); SimpleDateFormat hora = new SimpleDateFormat("HH:mm"); + SimpleDateFormat data = new SimpleDateFormat("dd/MM/yyyy"); while (rset.next()) { RelatorioGratuidadeBean gratuidadeBean = new RelatorioGratuidadeBean(); @@ -111,7 +112,8 @@ public class RelatorioGratuidade extends Relatorio { gratuidadeBean.setDesctipoventa(rset.getString("desctipoventa")); gratuidadeBean.setDestino(rset.getString("destino")); gratuidadeBean.setFeccreacion(rset.getDate("feccreacion")); - gratuidadeBean.setFechorviaje(hora.format(rset.getTimestamp("fechorviaje"))); + gratuidadeBean.setFecdatviaje(rset.getTimestamp("fechorviaje") != null ? data.format(rset.getTimestamp("fechorviaje")) : ""); + gratuidadeBean.setFechorviaje(rset.getTimestamp("fechorviaje") != null ? hora.format(rset.getTimestamp("fechorviaje")) : ""); gratuidadeBean.setKm(rset.getInt("numkmviaje")); gratuidadeBean.setLinha(rset.getString("descruta")); gratuidadeBean.setNombpasajero(rset.getString("nombpasajero")); diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioGratuidade.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioGratuidade.jasper index e72880d49e80e88ef24e6c57fde24ed6f89bec1b..6a70cd7c51531483c6a178180c5bb49ed28ca5db 100644 GIT binary patch literal 59493 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 y~Y z@;9t8{2glof7hDG-?y^)2i8>nkyXq;wx;vXtup>EtAc-R)$(twdj7q2CjY@&%Ku|s z#(%M{;J;bd^WUx2{4Z+*R@8SImbKZit!+kI>nS7Ede-P*?J)MU-ZZ*cyNs^Z$HxBF zx5fe1_r^ii??!KHuhGwLYxK9n#^H7kV}RY$IKn>E7-A1FM%bf_k@i?)tes|zvonpO z?E>Q%yU3VmpKPSrvyCi!zA?$JF{apyjj8q-MuB~iQD|Rkl-MhcY4$2(hP}?1X|Fd< zvF|fV?FWr=d%IC#KWWUfUpAulYeu#Go>60eXw=(Z8V&Y0#zK3KvB>_-I3vY2&P)jz z=cIHr&Q0lJT$s|^xG3ddyl!T8&Zlzu1ktVZb&H>xil#j zxh^Rdxgn)k@m@u#uEE>v2 z1}J6bk!FQC!K^ZmHEYdub0I=4F(;enn%U+BX0Ca;nP*;Q9&fHPi_9AlYn^$5x!#;* zZZc0Y?=xqc4qybn`B&%-m>InD<(>=6zPZx!F3?++r;?AGR(tAF-}5w_DenPgtwX zr>za3)VLC73(SURqI*v4Qq$_ruC-zuC>ejr}eSv7g8iG7mSS7!DIsf8N=IvQN*8Nt zN^dJSLsGcK|IZd`3W zX{^Bh#{JfF#%Ak9<1y|W-2yRW&)KG?hu!ooxLVdkUuAoFQ^ zu=$)l%zV`zZoY1hHh0=%%n$4%&Cl$kAYdG8es3RV{$yuBpvW}$+Sw2ya;&y?p4G|D zhwxBj^|Fg0Fq~i=Zl7okvQL75aI!VVE`v}o$C_wYTG{qoYbu0}V!O(kZr535_Gwmy z-DuU?3#@v3iFKxZy0z3k+q%qNYF%NUZ(VO+V6C<v#KhYp=c0ZfoCdhwc099`^lqPkW1fsJ+!5 zU_WAyvLCg_+E3VN_TTMH`x(2ye%3CsU$9TMU$kf2uiEqN*X$bmO?$EZmVJi(Px~T! zr+umYp}o@HWv{Y7vDew3+UxBvkn)%IgZ8)fcKbW~N&83pW&0<@++)9I|BBFmfcmHX zO$xX7q!{*ZDJdy-N}H5WO1qSfDdChZFngzTN;x>CTgt$cgCG_ifE`bqkHR;$18<7Q W5-V81Nl$r+ehMxDl{**V>;FIUlk}wk literal 59381 zcmeIb33yet_BNjEp&ZHqfr2QaOezS-q~M6s30vr7TR=c9r9Hrrwx_nIOinoA0M4Q) ziUSJHiU^1kUQuyY^eXp?1A4FXaGmkWz4(7uvWKK+_wRczvXiWxWaZ7; z$x3#z_5@? zS-?6}#cJ!LHIbakcx9aJTX06@+{$6m*s!ulL$tCcy0CIaP2{)&*2TH4sIoRv)--cw zbbg$5l{eQ^*3BAL7H^2w&BBcxof{jnYbqNX&t&H^V}1iWJQ;5@DjUIIX%;Tc861?) z_Ae>RotRTxQI=bppIJ~bDYvvNzqqJkVt!6O3(ttfwUrGEiX!uHdt@r><3&x5#%EJpUZk=*(vVqK?WXD!Z7h$*Ya&jXe3o7lnHiUi zX0Z;jhG?V?fTLWH>O~IGS+l`)dkP31vp@i-@!|$#4fY%82Dhs1LUd#eMV)~oLLQkp*qeEE&%q!8fOmE{SOY{l6T zNfX9V(y-E|Ixj(PT~jUc3CnyW4%GaX7bigyano3+8tgVk;*D`Oa9Yxm#+Opfa4Y3r z9hq6#R1+_YFQ|#c*&(eY6t^K+T6H8|8Le^H=_o^GZbb*QmW#X*`E;EbYpAV^kE^VT z#~K#+5)R0twc>dzi^St>ANgQ3#iKQNj)?CNJtR$NS@A#=uugb5;v_g4P9171qjgSY z~#noT_$K1Z`4fO%pI1nY6Z|S&Mz?bXrx2sK%=!v?TUUS^N0X z>J&Ai^`c5V2^S?zV`+`lw2+EJTaya6aoaV@$5XH|jkS+QYU^t%F^k3j9H7|5ut7j zUHae@yG?qADIsIjtG7$uX{ODNP){pQ;GzZdv*tZ#^6^od6!jfIulm#hVG8iqP~ zWT!EPC(U0-v#2BGDBGcd9g!lcxiyhm^wKAxBSqu6=o)yMt7b=QsvAIac@&R&L9|iy zQ4u9woDE6JA>dQ)K5l+JT0Mit;GvY|(9DL0$_13~{PW*F@TRSmx0;OSGpjMWFhT;w z*gOkPx+h$W*Vosd+rWkUSJ?WmHYSH}%p?W|lY4sF!!s+5=sq|>@Y0RF1 zhXsAZA+7ZdVqlzK-_+pT+OlpX$IxXTp8M_6S1ul907PmV-mFpwiAo&`_J=3KO<})0 zGCw{p8mUp9?e58+?T#~Iu{qFH<`hKcMryKHr^sCN`a;hrkJd)A*gmt-_zgADx;f=g znj-Nm*3pjvX)5cEULoEPiC4`g<)(OUq+uqyhXU5EvaV`&tbr6j|B0tI=?dk+FGf5q zt&hy&HayT7eoA66^)5D7tC)DSF$&|UaQZEWv;Do=WeWBaSnuK8K*Mn}@-&vAkQ-2S zsDzN6BU+Q4JQwAXN+%WS+RMwUG%_=S?xU)Cc?GPecTagNRuhlbH{+;)`3&nFwc8ZY z#w#JH8G=j(`g8rnBjQ%xld2XoQJd=wn5a>5;>jV0AHb8BZrs;eXJ zP5X!^Iyxs(J{v>Xtl7@JVTy*XRZZQD6W1ZyII#|RLli{)P=uJcXn^iRQ<+3KJ5aO( zCS?a~+EG4PG0YWPQ)Ua~jljDDrEw;0lnt7_vl8Xtmx2~cSvvW+*ip~eR8P4=-XY(j z;T>Kv@oK1?)lgYKJI)SE+B)M)>8TdC62J8Tysj!nGUVh;QR8%}k+U}q#?E3wmxyCn z#OpwY8e(#`=pfS34LfiQOUkeir&1>e2Md}&YV36KBGhLj9kDtqT`(fVqg9F0zHb7- zVeZJ*nVY2MDL6#GlIkd*(5D=btWU{jo&wwhPYcaI^6SP$(XCIOjn0uqeK80M3g!n9 zOeLyCO&X`No=yttU30{o(j6c{#K>71sg2EzkmS)Fq9e{?;rdu(l;+f=gktjFD2G=H zhjzup3gW-4l3r%%0$^sMIEH7oKgw< zp-9YXBWjW6oX7%4l&#uWwde`(7`7+B)24%4Z_`5D?Fd^3JX`1%MR!9Pw<}=#DN)qB zdPAa9a2FLcr_dBuBuW&hox+1=HB<=nmhRq!N9ZHjv!U}wgxYp^^QjD_$bdfJ%x@O> z!(b})kXfETDYv4$82?M0{FAD^ z)JF|%RyUcsmVFO3>#WS8oQk~M{FCy^p;gOiiX@7i_# zB}Zd6fyZ|)t*W52>g?ZF)P(W3VetdY4(xFK&L!@2AdMhCGMTC*AP5-s17NTUa>qG5 zN;XsNE2(S3fGo458BvGkdJwfEhVJ%`azvBdA=87iAJ67THNq>LXaIPgzh+Up&yO3Lb~LO8Fwmm3YOQQ6G*+v#i;5?=L9~7K#BVe!pBd3=EU{P3ZmOFDwPko~ z%NTwx*^~spb`s;Ac=MsmiM#r-rIE@Sk0RE=Mq>p{mXu@#t$9hcQ{Mb2I$_mBcl6|_ z`{)#V!e)8-02o=!BE$=Dapt_n{CYFa+E>LI8lu&e`PFVyqBv#b&yvd~ulH$K^zJQx ze2K4gWHl-xbI3ZSf>%OV(8SZ^^-uT(OdY<*k zxP@*XByTDZw-!+v@h8%h$dd71L8>g2o0!WBr$JJuB~k-AGnq^hPH!p2^Z)|55xmSG zwupfS!Jq0-D%lM5P|!UyMUvTwJgSMpbKsK;rnP8~4l^UP);Kp>c}B#|hweJF9t+S+ z7MFo+wuTNgc5eR{F!*33owTuM|JXKC5F zMdi7rE*rA&Alxsa1j1P)Z_;p=R7ubV5tX3ft`erZ+<9eOL=5S;FYfKF_lt0?wZ&iP^A11COSmc8FzVE+JNFP!@Vu$R;T>{Wt>y-LuqcL)jC-`6JWj|;#) zjMp($(HQo$R945_+#Dfq1N1o<9NteE`a5sA;+1u;HqAaF`=K>`2TypnIrLP13ghS# zbf0h@4}f1%1K?K)8vH6jgWn+}!2h@ln0HMk`o{;r-+_7<{Nm9%4}FoDc*YV%JRdlV z*UBl4po>;^>i%H)3x}<%eR{{Rd-LwzOPse7&cb;i0B1=Jz*!||II9E=XNQo0^9vrn zt|uAJV*+p%Jvn-pS&=$73s1734mNu10Yuk8ssWLgWMs2CB0XF$7j;BgCgN9D z5j)AAg+Rv!z8W__5B8M1bu5XRwEZSEt#REe8=|uw*z)PFvX$}i>vN%QCTcGixXj2( z2Mw$LAU=ijNk9WgYCr?11g!y7g4O^I0UYTK@QKHx>q*uCCk8Y?xN2^srBT%>Em6|@ zK~+2`Ww7sFU-;i6ZvE`zC6|4k_T?=T#xw`pW!)(*2nA*Lq)7?r2V2^AHH`|{!?<`&!t>*<1D=hn{DMDA0ab&o9`Gq z^@ewTKXm1(uP>NgGU52PHv?zLTR7}LiOt|p6PrOJsLh}e)MjuA3C-}IHZ?0X4iaC!zHEvW%Ws{{>cm7pQ*5E78?*(Rj31CUN@jLd4nE==by zb+8XYUk;rwMX^5r-6ONk+rF~@t-sDYqw2GqMa{vca$8r*`5*#ZI0FL!m(&2jRe}b% zN|^5QLEiA~Ctt0u4%fbT)QZhd?;eM?(KT(qY*DWO<&U3C7z?L30AooFz*r?{ z7^?&gV}}5ibc~CACLLcgj86){7{?(h<4uijJ`T)IIf)SWL?1M%buo5cI6V4fziW3+ zUw!404<5Yn?VocJ^lK_Dg}&l+f>}7H2EZ(-0Whls4Q7>~!R!zcU_RA_$GawjIWGWa zya1{$ruloVn}vfk)Zy0W@0ddJO(~;(*H1?-*x7IU@x2CK`|iGevrvvpIeRZlWu#YCl=`Z=f=m`6oQ@{CR z`PiL@EPeRMZW*uUf4rBlFC^H7gR>gMt@@Tn5*7x)E|W=u2D?g_?(*c7v5>IU`xN=| z*~1*3WU!A9fW1Rq3>%bcX{UVRa(KuUcUf#=7jqN<7s#iC`uW5EJL}aa-ud~l%>(Av zf0Xy7TSIrGBm`6FVlE{_gtJ)krJ*jVlAyj@lPNBh1PygHg@(FANI-qD3b^nmLw!O3 z>YWJndYnuRe7P3Kfkrm7oFd5E6jDzD>Xv1OT6og{r2;rpktdxqFMlD5={^@N1=KaWs`p zSKf8f!V{;A>c7vchdg}EcuWR#O@(B<^)*4hil7$G9RW~FY5>$KL4#T)Xiz(Z1gP(5 z6V!zPP}6(+s)h&-T*vC%%&7L_y?qJ;=`k2c#o5S|M0`=7?dhw=EWPcGF9y8+>ekG+ zf^bivZ&^#Y3+Leg+$A*tca@;wt`aod9YO-`54%u#*JOQ5Q2_2X_EXJn-j}y1-RRSe z1+7cBGj87Z_|3&7HJ=Z@WqIWT^E(ycu}GBe6i|MKP!`Tp0Vqpq0Lm&sLs=zgC_97% zl%Mj@bv?;YE)GCBEPC+DMr=w+STAW2Ym^g{!;2kmX3VsKmFgxJ2rFPufe`6=qCq&z7JkA%#77Uae$%`N9g~5px+(nizBNkq5tHtiXC@;bJeU# zAI*K>tatNnb!+QthVsR8J#1Py(aprP*&643w5XVUQ{6Zz5r z^v$ZOnQkVijT|vkeup^-qMkx0sTB7as``p|lxBa9!p^0fdf_O1 zNonpR><*+|i58vzXv^7j$9xC)!5^K(=#p&D{#1s8pM^M5k;Qt@Q(ijBQ9>99C9_O@y}L!2tdcHYi2qczwL?eCbSnsr4^v&iT{Dml3axqTZX z)5xHWe^z=>YnzN|d$~AR4Ssa<5yVUeY;v606lqw{`kC^R={DMkQcCw`@F&h|QQgMETFG1tb!1}+ znH<&{Qj?r}kw>o@Zj&LPwjqn$9HNe^u5Zd zrO`C_)RHKhbW=;vY-5s=sGB$<2>Vg9hh{}*o%-eX6Oa)Am@Vo=jO5 zQ4%F-(q;=-sU=d^8dFQ5?JG(xiLyf`#RSy9wB?afH&UinM00gIwN&DrWooy&uaQ%` z+j+~c+}w&Z(guvw?{+uGq@IFa9x8Vykvr!VSc*4S!&Y2jb!s>JZ+%j`UwL1VT7vdc z&Sq7{QoEmK0jb^TOp%qFgWHovl^&%L*h7Q3$8zPOf3`gBgwb7UJV{1(Upec?!dDF1 zGQF=m!XJncvn?kGg^K47o9%`Dv2n2m46C&m=<8-pWn`#i0Zl$(ya4A4VUcWK$M}Iz zYno}Pt*Qx~>Y!D@ya{w;??hVjq1YX@{R3>utt}sG>I|^Sj%wgm|c)rR#s6^oSB2ebc!T&7u*SJb7Epv5F?wCS{6N>EGCu~ROG?t zLji<5fXhB2Cu&FBNTwtzYx7{ur6$tg80^$C?dD`UF25ibk4#x{0ZhxPj3qt8FDnhZ zxzs2%uzaKC?KMYkVF@f@-f@1(S~>v84hj+Nw@s6iu{v` zic51VN-|H%FM@p#y+2WU1n0P|%N3(KF*+;CqrB5uIm|2=%T#=uXdTHT;{Gz-}G(QX@ z%6&`8r+hAxFpxYcKfAci3De5+%O@7Jr6eEzNL@7+y;8-oqlaVL(urwXg}Y;+_2M!F zOAMQ#m?exZT5%SJVPmq;J9J?zR*MtgZV`I z57D}zWK44C$obxJaq(E^RW{DX;B2>h|1VqioxaUv#yHqTK))vYAsBg%&&C=R%uQ9# zuRn1t2{ucc7lKPa3vinI#Tg$?p8c@{iA+L!#*@u`VR?JR(2+-uIQqzuqmLXtV#Lu$ zj2KP(E6pC1h1);;kci>Es8 zkvmWQ=pPf`KjHcdvuAXAZQT1%O659O5~b8z2b=Nvg=a4xvN6ZiNkgc6(t%vDYT;($ zS3l_jEbMk+_^xV#CXGcYn9YpV;Y~Lg`y>4_QFqN^?a{;$LB%?&lGa(GOTpArwqKxQ zQYF#AWhajhu@Vb0fX!Xj)r%$WoD!3p42$E&VfkvMoH7sa^701K=Jp?Yw{VMQ3LT-`W+Zeh zXH{?Dh{MEqh_N`gqG%!p#nRO525XoGu#_g%D#)Sns9?+-=)y={)KKwS&m5sJZM2o? zj@iWp6AOzxwkhAE@dk$K5>zg|t}zdfGh56;M7Kj=nQbeVUS?{1TdAiXF2D}Eny{D* zQFg}!u}g#;k4roCQm9E2xJ*kuz2q`oh=iQ55i6Ok^Vlx+G6H!FrJmkF(vbkkrD$IW zK$?tAN3&C7$y5iEoI=wbM>&Wu+_1e(XddX+y%QCG!X(PqpQF|%x9q1SZj z0mU?19oCBM8i$F_nu^9qZG~7jq62@#I2Z_C+@X?u9w;D|@`bA0A)s(=r8uZ)e7hsX zqR}NDAFL|L?~RBqEXgaTfS$vKUS2*0wJ=r)2z_(lT$%$HvF?V{Zmvy3--teeCC`4e!kfkceCE)hU2cT`@GN8ngh=2msRkizuiElk*+AJM0Tv|?i%w#LRmQHORBmN z)uBp)x)D_)s4u-W!gQAxuZ#g$4#R_>w{jg{-ub3R&8H^342*~W(meAWSLYu6G9{Gu8MD-(5M}dV+ix~ z@_a0`NMw95F#^P-t1BjQKPP49i;1(hlpyo0136-HL*HrFRQH>_x#GhsO15?wf2!Lw zgqV2!56eJyDOsNMFl;6`_t{;#`Jt@EUc`! z+uqc&S_F6vRbDuE2LLRo0RXE64Pcd^0qhXKln(ISDx1Qe4B&~)0mk%H4mWBx-s9L6 zYt8r*CHlfXSP1*E8vKX2!Y+-Dp$QaWe^h23BEHF~!vV`-HP20BA`K09qwzK&u1|Xomofbf9;5Jh~noXfeFw^Fz)|RwSnR;yxba zhKQ@hUhme5qzcolGkPP829>VRU1Vf^YfsQm|RBZm9#k(oor|+0Pb@;kW zpA-8Gl(ETgAB@Lj%k9dug4>(DRq-+p9oFaAKK=Ujq16okPmtXQ$WwIKOy>bgP0>03 z`&FTBe?REJ*sP4m;wv*(tIbQo*ZMgYs~hftP#{E)(C17y96L0s_s5S zR#zVr$Cs>$yLwIRJVa>XZr+NZcw0d`4F{@VhW8<#-hl;ZFv1cMs^`p@TYi=M_D{?a6uY$kFoMK?8^W8rjP_g>l1MH1r;# zlT&(#)*XFj@%}5<{BYHVv)09a8oRBHZ9AFTRyY#_+E!8n+EyiKZL1Qrwsi;zZ9B0| zZM(16w*EuZ$$5y}m+)$a+T+vH>!(~}q75lQd}-a+_h0u%_iu)@|M|}s$_qaAAr{$> zM~Bx=DO5xTD7hBx!eaegP-X3Vuwp3^#>icGh`xw{Xr05NJsa5NMU4L9G%rs2xHA)aPi> zP#_u9`v*Ynt{!Wr)J3i>01dU0?ZhuNpfC8cZ|I$GGETj2&yM2#J}q3<9B7~a7JH4Q z1hQ~04**$G13*>@8ptX^1KA;fCBcg)&zJj5I=*Be_Y44eA4i@WBlvCt+1ytDTEH3F zpjawS4d)fGoJ1z;?x0T`Jbr^2vB zYEWO@c}4jAf@!Z_G-T-D^p)eWO-1jY{SrlSLBrrWf?7Ch1E7}F0H{@h2DM7ipmqoe zP_OlwbbQIg`M?0E-EO14nOzH!T_ft}&H8t)a9#}n zT2cdmRtXx=DnSF!sf(l!f!R0F)&)0A-b+p{x=#lpR6>%70T)5&mQ-_X$AR z?K-^8N@|WR;Ou@xB{iHM+W6-W>8E}2k97rKoE(jw^vGUF^B07(a6SvbSyBUVRtXx; zDnY~9Atd1ZnTkrQIQI>}Im78T=2qgXz}c}G4a&DvM20P3eGrqcK2pQ_iQ(xLNUpnXglc2V=c{u!quoliw0a#0F0M;r&!&)V1SUZFStbb|~*8Kvo?&4tWXdO}C z&{Hy`-DU99kY4-YS=EzIlJJL1>(!#O+OhnqDCL*m7RHQY6inL2e zK>E)%A>BU!X;-R+mFCLE#^k#KeC4Abln;{Z)UdukZTrg$XMTK4`@B2<^Pgji58n%{ zI}z5x39zOw37rD4mdPYR!&)V1SUZH~Sldah=_hRYJ2(JqSE>`gB#}(2T`O9tA$`I1 zOJBMDvL&xPzkb_+3+~7(*$bo(Af$z}e}Gg=Y5>wIK|@+4Xh=JR1f=(GlT;rPfHV#) zi`iid#V$_^m`WfTU##nqEA~lTfUj70v{O0^$(pKKT=$zWZhnh>X&%P)wVA^755yrw98-TH- z24JibG>lckbeA8mj4a|v@Z!!7?Xf0I}OA>t8Pr*|vc40hoYqM~{;l%1bYLb7bZWzVqkE zdhz6i6lSzVxvP#fUb_fY5&+?gce8~iP za59v&FZhVeT0q(T6jf>{U)WfGcF|GajM#8_(UBXz8k@EkD9)ejFJeNCr1>$YZJbNg%Ua(3+n z#1|68!U;H%BncM=KrE952(n7hAa)1|5V!3}(%}IRy8~adPpl<_+5OTlLf%65;T|{LITWJ3OH0JS${D! z0A_dnIpJd`$$*ADi;tV62K1t(hoAH0wktm!Huuoyc7I*4aW89vHS~&LvAT6l@NUH=5X_YYD<;N@IKB~K}Xxt;i zOi-r=^COY*cXnGe?SzB>b?w-BdkV7MYPCUS-bfG#XMF(7k{STBO3+|d2^!1}Apz#~ zD#F5_4CWC@V8$X{U6ub4b&*#Ks)lO?JT;gX9erf?lIpj5tmJclyXVg=eD15w9rW`A zvv8gZfLT%lU{(nl%ql^H*&!sr{9K!09vJ|$t7<65z>`5tss>cw6eW4-S2r%bv9KQ`N+3%9s7iYkqaJ;E43>qc-A+Cn0#nbirE7nfAz6i+VF1|ol}x4Vr$ zwXNRQS5|N9cyU?JQJJ4Sa>bspMK0(1;~VZYX02fT$XNaP0h|bl76)~l8zQUA|)FjMKPQ)sw{_< zq!vs%?1N8^OH-fH&M3@yjZT&`b{s@!)eRkA>RM8*t%oT_D#U-{V3$3ksv*{hC8!zM zFfr@g0PGArWL>FOfr?21Nv_>K&N}-9dEB0}o_>^L9Lcj_%2_v`=-W}`>>xin z$b=_ny%TQG&FN}jcs7}Y315xmSt}GL);T*cAz#&|DQ5>K&;tyXa@H&1HpR-VR=psT znL(I&7IuS(us9}dkZNt_R9hOX<*d8UlVTw=h*!lbsFqAISsKKJXLFac{r$3hNpv7q zq*OO&$=LyZGQZ6nyTqDoNkgbwZM~MHvq(V#qMN?eWLUMv$yuKSE}Gfy<*egO`U*>h z^Ad-%p-IPLTG1+uSN=VPg=-S1m;O&;@3r zu3cn^_GmdL9lSUyz?nC5ob?r{yrm&8b9_Cq3MWKo!QiEz9RPK|^QRgIl4hK%mIhW%wnZsX0x>R%wXkV)=v5+g<*MB#GMjm?WJ#O zn59eKsbSVZ`c4nCu=Gt2vyRd?Bg{HUUv-%6BYiW&th4mZ4zn)OcSe|XmA;xV%aFdh zFzY6L^9WX8ojZX_)nA2NOb9hS?#~cXgN@Dt*_6*#POg zKFkJ6-wk1QnDi|Vvq92#bC?a5zFWfBLoV`L8D@t|-|b;GRQm1=vtiPASC|c#zSUti zLi+9rvyswwUzi;seGi1$k<#~2n2nOYN5WXs6JUW2Eo#Fy=Yp zz9+)$IO%&T%#N47XTofZ^gSD9CrICOVRoYQJs)OcrSHWs%ap#C!YoVrUJ0{o>3c2A za-{E#Fw2#`x58{3JBcuTJIwN=@2_E&FMaQY*?8&uTbNCdzW2kdK>9uivqI_nD9nna zZznodnj951p$~5;r!Pox)~TwgF&?Xh?d@uuy^V7=d|&}tE*wVZ{D;wZhLQ*AVM(V) zr-VMq)rh{WdHTa9h1qB9^K{hX3+LW()YUhJ*;g|9YxKI5#iYsxM1CtHzXNanSWkm+ zi2V!CyvAHR_9LFySrPDks8cRkEFD%n;|xsak2_5Au11B~&+L~D>?igss+xjEtm&}r z*e-CO>8>I6Z}gz5(i&pB(Va+bHN^gl?$_z#JT*1M{sa)dej4H&-L7+&W?MeQp@zG* z_H~Uk#BCttb)P~N4e@poHO2CHh_^?->fWaq)DQ6v(7GH#fYuq}9nqQ&T~Rkfd>?Qd zq-TbB7r(Zif*Il&eypcihBziM`Zo|lyazN9MVAcm{e2D;B{IYhz>SLb7~%)|MR;ms zi1#K{!aGzh^u-YG3y5?@F~s{r!EqrfE^;))5I+PBDOJM|9{_fdmqb>GBR|Y<8(kR; z@xc%ZRSOL9!!aB>MKn|YLVOr!?x%S|d_-zfH4;qm9JS*|phmjp7viHJVNePjwJ*ev z0z<0K7vjfoCcn-V;uxycuN8&(7(^(lUWlIvmBG{VLOc_>sY+gmXCnpRaW%XU&lM>g z^)AFu!gC7UF2wT@?I*tuDk10fVE`g?KUWru#g7F2qm9y;7MA@iNqp$WoIF z@relgYFvm<=475V#HS#QRNz8<8gSCJw-7%KWg;JZOePlM6|xep-WKAO#GO#uLLBO% zc+TBZPa%%(Q+#|W#Ai|Io~{<+Q82G5Y9T%cve-;Z3-MZ@0u?R9V@`FX5*FfTf&k?# z#L=TVA94%vCa|aIWFbC}3*(rr&FV>1(6@?j2Dal1z?-Iyh4@*hnkW8H#6tWW@Z+ms zA$}h2P?fI`KOdDRwJXFg#6y~>aE18AUc9Pmh4>}t?jv%c0SI;PloJ5IPqjVTUWkAH$PJQV=P|jIXuP+skhQ-LubEn$I zGD^ZE*nf&xdYa?g34Am91Yf1V8Xn~8FX{X_R*HLADOwLUc0&9GRM6#LwFwjATakf7 zaVEwg{<7%1#D+olfqoUYIeQ4b?&ftoR8E|jd58F$=p>vN_e^$(Z^L8nMA8A`5Pt^` zmJ>m}qjT;g#NYK(`<>Kw$dPk1ro8eDVTk|T=TP>DA-=;;O&u$~G=(1VLp*yTcHz@qhXGxFgMvN|e*R|Lms{9q+Gx&fb``%g0g~4FBy{O&tSv z`x$tG@n1jAc`Y8|fBFT}0BLZaH)r57OuxYi3FpmN$gq6@5*={JXot*vTg@S(Jpgn2 z+Tt2K>K)J#!Xx^^un`uWp3xBRTfuFl*JX(WO2nLSzIwi7FSG=#TC71LsI#iUqVF(npPOo+u5(_wMNWLR7=6&6=agvAxpU~$DHSX?m$7FSGw#TCAJ zJ|^drwP*p(U`2@^ibV!`Uut3Ds6Cd9I$^OW1ItAFVS(sCEDiO;qR;>=2Mxh9KLVlA zSo|T08jGc$TrB#G2elXrJ>^*9nS#Zg)3K~mg}Y~CDW?{TII!u?=3(LHY@|LPi#3a} zOtSkpgQZw7mo{f_@6_=CItp~Xx_%zw0)DTvvl#Y`JCID<1S>NJWnw5SS- zvb3m5ib~U>swgU?MMWqoU5lDUQDH4AN>QD(s5unXS&OQrsIFR6jH0?}QD;)rzFJfx zMeV0WHBnSgEovS`_0pmiP}D(M)L9hOM~ga#qWWo3=TX$bTGaUzb*L6~Aw><;qAsSW zL0Z%$6g5PPx{RWRYEerlYPc44g)dbL@jNm%7t%EkPvCq!JqsZD3$bbbEXdc{c)reI z*JCTj8g?Fgf-PdNBW5SN0Lx$(@-%i4-=AH~hp@$v_e*#wyOc-RWqdxnoG)QZ_)4~v zuVq*8=h>BfJG+X1&93JEW!D&;*|kQ0b{(V@D|k|R%>j<|iaL#y-0~xzbsI&E)1vO6s5~ud z6-ABLqVA@s0xfC{MHOjL_fk}e7Ii;Gm19)C?`^X^N`WqBc|1OfBj!6g69m+CouhXi+avRE-w3m7?mj zsFx|KUWEouivU8F^QNKuQm zsE;Y?QZ35Y2>@Mt!1w}Sd=dVwfbk{3_%dL81u(t}7+(X7uVbglW&CoiU(m5+3!y7$ zbPWB8ikgh24d#Uh+=uI-pwb_9c>z$y>+oBM-(vi(#cw5kxQ}D2D(2#hzk%Ne_I$AsoOd*P0A2S1=;-Gtv7{MO^Q1;1_heT?6C_#rxY&fOzBOd3QkUoPyxq&}}*je&61dz)bmX^VvMFyzF~ZKyvCpKzAe4K z!24I}{R-aqr1v9u|0ccf!27=Rz69?F()%>LA4%_{@a~k}HSm5ay|=*oPwBk|-p{3X zF}z<&?^*DEExq;dek;8Zc)yq4sqp?Fy~XhUB)vKC{vy4{!26r@4u$u3>81AnLwc$G z|0BH};oT#>#-I#?2`}FTuOYqP!fQ$IC-A08?|W#KDH86&HT)%nAWslU2pWF^p{Kpj z0|-6ng;pZ8)(c&Y&{h$G@bU`~@`RVi5xU8{b0$Ksd!bVh@`Rp`N9Z<>c05AYd7+^Q z-7i8^LLY?Q^g>+`+U$iagdq5`4(vCCws@g05qi}Ny^qknUg$N1@K`zNNc>;$LXRM{ z!VBGr&^2D@dW6<_p~VQ@Awtg;u3_^Ly3wPZfzV&P(5VP*6d}}z6(RJpM;nXK-Ck%U zLS8$tgVA^)(Rgfs5I&SoI<4}a`vn8Yulzy0pWVRzz;U!a7)buaLaxc*;1(8D zL;M508vPh=IltzeuxQwo|Bg46yLk^IjqitrvtC9QexT8f_ceO)enxM8sBtVGV2t5| zja)v&$m7F}#e9Tu86Ra_!$%v}^J9%i`Eka2exmU-A8S0zbBsMa*W^6kY|qD=VP0f* zx?{mfst>YZ4}y<7)AEwMyb8bD6^LvlkHW;DfVjPRC}#)n*EqjX>T@W*v}a= z?bnT2_FKjrdxueDe`M6#Um0iG-x^K!E@Q6!hp{ltHqJ^58Rw;SHWsC27#F1-WL%uq z*SIY0FsLQm=aNKmrN}(Zf1sY3$HP5=XJ&%{7mC+yqH_f&oS=fi;esFWyZt& zTH_JE%y^8igmQ9+v5DVjJi#9{p5Yse&3u!wg+FIJ&tEWJ;%^u)^KHiK`~%|+{;}~k z|Jrzme`jpxzZ-w!yNwTwG~+{~z43|B#rV|dW_)h+GQKc+8{Zhm8s8dYj310#<3}UU z_|;f!{AOHc{9#;U>^819{xlxNvi5q@GM+YV<5{!4vByj|x!K8VZ|-A;%?z^}{`D~T zGkcr+oBhlK%|Yft=Hc*-GW(lHn*+?T=0G#s9AZvDY>_#_oMetPr~_0&DI!mg*Dc^&B`-xw!F*jLPnonCdna^0an9o^j%q`Y^=2mOH z`I7ax`I@!GeBFA{+-7Yv-?sj0zGr=GZnr))cUa$?6!y?a}7H?M(9zJICB(7n^_DrIu-*W?A-hD`d~H+S_$j zM|*+Q$v)faYF}by*q2*9>}A$|_HwJ2y~;Y!UTyWY*INDT$E-u`&DH?>Icu=}x;4ap z%NlO)utwM)S)=T)tkL$j*0J_3>p1%l>%=tM8k-ifa?(0mxoH_ze%e9S__V%OQQBeF zB&bE5|3@wQe@!i->FNK9)gmL~f4f@bl=wet(f{RYk+Wj*KdVLFdd>gQt3~2TPo@@G z70kf;LyZ;Tb=FLNrga8iXwBj0U@c;?RnIT8;`~~xi7&Gj@Rim=eus4~zt1|4KWJUZ zH&_?(P1dDY^SF$^U|qrAz*@yN>stPSbsg3=Zp2!~a{e9GEq=Fd<-4srj5O;`qrJ5n z>lAB@Zr1%+n|Q$JZ9QTfYppfLU`->}+F;~aPZ*1>CymRj&Bis>v&Qw-^Twmr3&wiu zW#eh<72{d!4P%e>rpc{$%=Q@E!`9!-Zr0z;9@d9uZ|fto9|rnC)<4X{tuM?`)|ckd z*0<(Z4E)*FkLCpHC$q@<&75TIGN(WZsI>lLR@->3VRJKP+vYqw&0J`wn-|y}%!}=P z%q#59=GAsLbGhB!Tw(8Tu7Z-V+CIp9$nI^fwfmc!?1RmxpfEgdA7*Z~4>#YmhnjEO zBhB}rKzwK)1qI`1^Go}9C>3MOpP@|bwzHs2jI+}0lb}FMu)5d@%!MP&_K_m{n~zS}{9rHQ4j5bD)SU zvd^)W*ymbT+80Eqm~cKx9tV?JNDW3cKZ_hZ}#Q(2lg`iLwmXX ziM`7H)Lw0WZm+e!K(5~)mv8Oo>>rTwNBb@NS9^#3oBfgfhy9hk8 + @@ -550,12 +551,12 @@ - + - + diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/utilitarios/RelatorioGratuidadeBean.java b/src/java/com/rjconsultores/ventaboletos/relatorios/utilitarios/RelatorioGratuidadeBean.java index 4cd8c95e7..43e5461b6 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/utilitarios/RelatorioGratuidadeBean.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/utilitarios/RelatorioGratuidadeBean.java @@ -14,6 +14,7 @@ public class RelatorioGratuidadeBean { private String linha; private String corridaId; private String fechorviaje; + private String fecdatviaje; private String desctipoventa; private String nombpasajero; private String descnumdoc; @@ -41,6 +42,18 @@ public class RelatorioGratuidadeBean { private String descorgao; private String ccf; + public String getFecdatviaje() { + return fecdatviaje; + } + public void setFecdatviaje(String fecdatviaje) { + this.fecdatviaje = fecdatviaje; + } + public void setFechorviaje(String fechorviaje) { + this.fechorviaje = fechorviaje; + } + public String getFechorviaje() { + return fechorviaje; + } public String getDescorgao() { return descorgao; } @@ -143,12 +156,6 @@ public class RelatorioGratuidadeBean { public void setCorridaId(String corridaId) { this.corridaId = corridaId; } - public String getFechorviaje() { - return fechorviaje; - } - public void setFechorviaje(String fechorviaje) { - this.fechorviaje = fechorviaje; - } public String getDesctipoventa() { return desctipoventa; }