From cc5b2b71ee0fa9f466bfd7fea51a004de194ef9c Mon Sep 17 00:00:00 2001 From: frederico Date: Tue, 6 Nov 2018 14:53:12 +0000 Subject: [PATCH] =?UTF-8?q?fixed=20bug#12595=20dev:Valdir=20qua:Jos=C3=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@86765 d1611594-4594-4d17-8e1d-87c2c4800839 --- .../impl/RelatorioGratuidadeARTESP.java | 15 +++++++------- .../RelatorioGratuidadeARTESP.jasper | Bin 42737 -> 43470 bytes .../templates/RelatorioGratuidadeARTESP.jrxml | 19 ++++++++++-------- .../RelatorioGratuidadeARTESPBean.java | 19 +++++++++++++----- 4 files changed, 32 insertions(+), 21 deletions(-) diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioGratuidadeARTESP.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioGratuidadeARTESP.java index aff9dc45c..5f18c7b39 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioGratuidadeARTESP.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioGratuidadeARTESP.java @@ -91,7 +91,8 @@ public class RelatorioGratuidadeARTESP extends Relatorio { bean.setNomeIdoso(rset.getString("NOMBPASAJERO")); bean.setRG(rset.getString("RG")); bean.setCPF(rset.getString("CPF")); - bean.setTelEmail(rset.getString("telEmail")); + bean.setTel(rset.getString("tel")); + bean.setEmail(rset.getString("email")); bean.setEndereco(rset.getString("endereco")); bean.setDesistencia(rset.getBoolean("desistencia")); bean.setVlrGratuidade(rset.getBigDecimal("vlrGratuidade")); @@ -150,12 +151,10 @@ public class RelatorioGratuidadeARTESP extends Relatorio { sql.append("THEN b.DESCNUMDOC2 ELSE c.NUMIDENTIFICADOS "); sql.append("END AS CPF, "); sql.append("r.PREFIXO AS LINHA, "); - sql.append("cd.DESCCALLE || ' #' || cd.NUMEXTERIOR || '-' || "); + sql.append("cd.DESCCALLE || ', ' || cd.NUMEXTERIOR || '-' || "); sql.append("cd.DESCIUDAD || '/' || cd.DESESTADO AS ENDERECO, "); - sql.append("CASE "); - sql.append("WHEN c.NUMTELEFONO IS NOT NULL "); - sql.append("THEN c.NUMTELEFONO ELSE c.DESCCORREO "); - sql.append("END AS telEmail, "); + sql.append("c.NUMTELEFONO AS tel,"); + sql.append("c.DESCCORREO AS email, "); sql.append("CASE "); sql.append("WHEN B.MOTIVOCANCELACION_ID IN (31, 32, 90) "); sql.append("THEN 1 ELSE 0 "); @@ -196,8 +195,8 @@ public class RelatorioGratuidadeARTESP extends Relatorio { sql.append(" group by OC.DESCORGAO, O.CODEMPRESAPORORGAO, B.FECHORVIAJE, ca.desccategoria, "); sql.append(" ori.cveparada, ori.descparada, des.cveparada, B.NUMASIENTO, des.descparada, "); - sql.append(" b.FECCORRIDA, CASE WHEN C.NUMTELEFONO IS NOT NULL THEN c.NUMTELEFONO ELSE c.DESCCORREO END, CASE WHEN b.DESCNUMDOC IS NOT NULL THEN b.DESCNUMDOC ELSE c.NUMIDENTIFICAUNO END, "); - sql.append(" b.NUMFOLIOSISTEMA, CASE WHEN b.DESCNUMDOC2 IS NOT NULL THEN b.DESCNUMDOC2 ELSE c.NUMIDENTIFICADOS END, b.NOMBPASAJERO, b.NUMIDENTIFICACION, T.PRECIO, b.PRECIOPAGADO, b.descorgaodoc, r.PREFIXO, cd.DESCCALLE || ' #' || cd.NUMEXTERIOR || '-' || cd.DESCIUDAD || '/' || cd.DESESTADO, B.MOTIVOCANCELACION_ID, "); + sql.append(" b.FECCORRIDA, C.NUMTELEFONO, c.DESCCORREO, CASE WHEN b.DESCNUMDOC IS NOT NULL THEN b.DESCNUMDOC ELSE c.NUMIDENTIFICAUNO END, "); + sql.append(" b.NUMFOLIOSISTEMA, CASE WHEN b.DESCNUMDOC2 IS NOT NULL THEN b.DESCNUMDOC2 ELSE c.NUMIDENTIFICADOS END, b.NOMBPASAJERO, b.NUMIDENTIFICACION, T.PRECIO, b.PRECIOPAGADO, b.descorgaodoc, r.PREFIXO, cd.DESCCALLE || ', ' || cd.NUMEXTERIOR || '-' || cd.DESCIUDAD || '/' || cd.DESESTADO, B.MOTIVOCANCELACION_ID, "); sql.append(" T.IMPORTEOUTROS, T.IMPORTEPEDAGIO, T.IMPORTESEGURO, T.IMPORTETAXAEMBARQUE, T.IMPORTETPP, "); sql.append(" b.IMPORTECATEGORIA, b.IMPORTEOUTROS, b.IMPORTEPEDAGIO, b.IMPORTESEGURO, b.IMPORTETAXAEMBARQUE, b.IMPORTETPP "); sql.append(" ORDER BY OC.DESCORGAO, O.CODEMPRESAPORORGAO, b.FECHORVIAJE, descorigem, descdestino "); diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioGratuidadeARTESP.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioGratuidadeARTESP.jasper index bbbaa92baae18f690ba107bb4f2b506a0bbeae78..d5955fc9d23ff3a03e0ed787850a299f070a96be 100644 GIT binary patch literal 43470 zcmeHwdwf*I+5gO(kSxi9fpAl>MwDB?1P~N2AW29du(>n|AfUu0*^q@zHtud9P%Dax zsA#K#qE)L{Yb$8g*W$Hm)nc{nTd)0jsY<=nOTE0_s#dGN?=v&!mOVMye181?c|Q&8 zoH=u!=ljev^UUq+`G5^bCfLM|NUAv5TD&Hl?2IH5kiWf@9dg;jI z--H(gGeRt{Io{qGjYZ~#Q{faF5n2;o7cPm$OBy1HXgC(#7+w{NoDgC|bg-Imd!(VO zwKdwEVnbEnSh!<#Nkb|T?O2U~gLJ?|c`Tevp3cr>qC3Hk@+;e_a1sTqFT}iw?#T?;)G!1 zhR#Tc<*o`huU(x08Cp{8$Pj2>l58z;@kNQ^ixMJxM+kFp{?;mdpK1YZcfD$8*B~- z$)oMEy){HqDRz)*7+tAo4DE=@9iT?i1!QG|2(iIv94TTP7oGCj!_f|1*%a%mSTsH?1+X^HK1UI*FSsxu1RKYwCu6y=hz7=th2%nS!&v8;2{z47ZW30- zJ)0oKr@x_$LGBJFab8T!S4^c)UdppG1@Yfl--(`MvR^I^=}e+RB|)7>j=yZqZi|q> zTFxK}8#-grRB0?0Ums}+u>#2`M5BuC&O{`cl;Wnym#hox?XZApP-h~JPA(OVB&)-y z$x(eou5$)Q{DDa-5lPDw%Xf5RWgAk|+YPq7HRe-&)0d4#){#+ud+!l?sB;aS3QA(6hG$}=4#1SvWrudc+~4lNO!6-8i_ghWw<}T3|bYB zuSGYzHWXPGiIuUzk#!JQvWsktwnxg?L2V#zA{Omf+lc-?k}6|^Y!`SfXT!m1sYE2z z+(!L!?Yc;!6)YEG!@?cSZSe$+U2HC*Ha-IVo}GliDo z`bcX8EZN*MzYsgb3ey;m$5PSG9wiDfyTIHT15-GZorswO(lkD)Q>SQV#{8IGwOT-LxkZjS>wUNd)h{x4!I&6@fF-&M7 zF{9n`qRGV_pf^}S)(=_8F}I7L2hk`zot$~(tcgjTJ^>6gI(jFQypn6x9w*wsm?g5Sa45_nx!=nRSQ>O{D+EyX7JqO-7`TD1&H z3O2SeKkM!_wzCduXO5FLZ0>pZCrnH?lN(R0>E z+T-gY#Ca4#3gR*r?2IR)qz=-+26}5!b+7bR#RjY=Rl17tZu~Z2P(^BIGYL3?8d7SQ zQ(MCjY+V%XGsXOg3U$w+|e@K(cF0 zC-;qMH9~7<%R}3OSd`+163z*+Q4S}Pu2z?*Galk3n$9!>WxCEmYMr^)NSQLhxMjFC zh?e7#@-~d|BXYjw@SekCiZK%70X=5kV0VL=j0g14*%1p^QYMdM|u*aH58p_ zW!1?|^%bGg#;PS1O^vnqUq=}recxd($*AHUbyJDEk{{_zx~#NjUekh#s`(2VF{)N- znjDH#^&hy(_+n@Kc_q*S7P25lJ;_ue;vxt zJ7U3&L^Vm16dTwO?nu%sUMn&fV(Wo=crf(!>wose+2_v^G}0fij^+j+xAN_9HC^b6 z6I=G|I5cnj{)+_2M4CW=s4>G&x=Cty3;;YRl3iX=(^ye23rq$InyKI2X9Rge$T{-)F>0rrf2>!toLON(Mm4PNtyd|S(Ate))Q?e;G z#G#SM$zo!Z&Isn5GiDT2&uo#Oq2?8YaPe(8fJcD;P!|GbYTT4^>>qUPL_Kxnco zu#B11c6=v`925pvA;pO{U`hyL_DRYQ*^kt@v+0zMW(X;SRsNK9rg{{zuGf6rTi!iV z_LaQuN;OLU?=4-=I$`QaO*pntEi%o^8bjN8gn9dxaUxa!k5Ze9leC4skEEg5U>2b1Onoc=I5l=BI?3yT-gOhp`%eNaXs?t<}OeDb$h252L1G;GMDSJLS{+CBT8$JKi z!dq%)A3%KmK=?@G_kQ@OU>^85JzV%WJ-qSJA$rB<_x;9av+cOevES}g>EVrx4$&(zFZCOl zF&@ZZLlo_7Du({pmXT0f4Olj149zvg>+-rTyZPTY+;aP=RUNf&9YAP4B50)Xz8^Fy zmH&@3W>$=~&dqpx+7)FCcKFk?#kN3g!Wh)58Uh z)59Aa9ilgIc)p8}c%d4eMs+8`;V(@aJ#hYKC2hc`MpM6c+~a1k;SbPo4HrxSay67i0V1_g7_c9I#R zv$y2dt!p0n#lJ?(F+P}n&!VdiAUaiqjx;L$&{4rW&~bXW&~bWrqoYIgicV#}(HZN5 zPK359VdsJ?(O%k4G0+*2F*;kn{7KohcgEfr@$#{^@82+Q!U05Q1)(F2ll{<9!937$ zdbrSWdU&IwL-dNy$u2@>(sqvUKxd$qY>CybBx156IYX$ynb*{^mwraxEmz zfScWgrt1b=Gbn|Z6Ygh{?YI;>#JQQFu{0E_XlQJzEn8So-Y7FW@t)`S6GbJJMeiQ^ z+U%9Dmp$vrhB7EEGv>%nyB~A%d_4-HjMM#iQ3dnhMW=_07o8q%UPL)**;QxV*()!e z?qVLi5Y0~0)TTtzMnOmRPkRw3=~_k_%2dmQ!tsh-?_6@hXHQ=G;`@hYfAsi5tRQ#~Wcj*&LwFHoBaN+o z5UOAv5IQ|v5IQ})A=Dvyg>Y-XAspucA*M}|&GXzU2G#j|O1&3!(igq_&^fzy!S44b zBp8ffjm!iOWOCEzf%^g{eRrTAIQMP)#iljmFI{-Z8y9{tYk2L$2N0a!Qc0!ppdUCY zm z>;da>o~4pX<0(IIR4@;4oE|Q4oF3lb=n%bv^HjgVndAY^0M|TlU$~?z<$k#AUVi>> ziZ|{mI5Ypoznrg&f@>gSv3^aV=#ek4Cou1&3b=KOcAxbD)M z#%_MPqPF}1f-;&wk;W)LP*gAvP@EnvP@Ep#py&|2f-=e^rujrs{T0)rJU}tZ>#Vu3 zzEDY@SoA~X7jyQV&~?YPV;0P=>-gg3n)41IDn}72(kSvnMFsOf#p&Tf#p&UViVo2$ zDn%w5=Ce;!iY-)(Bn4iB>4Jbcqo`bXij6FeoZc0VB`1!ZQg~F!*hz&a6^^W_5)}0jw==&wP9Dm;&1-({QoJez5D=z z^Ftz}G&cHyqk?&WL9weFAfy*Lt z&p5;G*<3+p6el9M5U4qV3uq>eJ!oSKwVG+EK!nc6UMQtwF}s=L%Gd3RVj z4h&8lOPPD`u zb@dfXaJ-V1DYEEbS$|Gf>Z_$xqI9%nh~GK9 zasM9@nba4hmgulZV@xkhpif}V>HGXW-9X^MMe;nRYAc*!O;oXx&zh)WC2`_wkJl7^ z(rGS=4#hg!lnl>0$rS8%FaRg%Xi<-F3KH3kOv3hZFkt*;Jf#N2`{d zh`0@2j)h7RdE$;fBcN(}RV=dz&ULiRVwh_?nT2+&H)I&Wo&(P;f;In_S#ULtn^{=L zuqCqy_Jmhv;V}u5SwNZ?$SkBwS?!x)%oD0o za5ZFGaanZryhwAjJxtwviXB`Z!DWQl101)tfYSQLiiSD}FeTJ|1eo3bjAg-#iyl4g za8rnlhFIv&d1cv)*|K4vyqB*so`CGYs0R&tIit&#HsE|rJ1$_sDQ4W%H$q?FA|-c^ zj<`=rIJg5H2d-#B_ir6o?I~|e(PW=*bp-AG)GNpS2Ao=~uc)i7Z)_^B#VryiD@9U+ zILS}Et4km0bTkgBDsaD1DGt{u)|J+mR#)I^iiW1@(mEAHiM2rzXn9iyq@yeHpoOIk zbrtovL4-=>jFj=sysq?y*ww4Swi;Y|>r7MK-j_T*R*Z^ts2fUM(erim>e7=zp~V;p zI{4MWu{S-MT0Y4C8}itxH%-|(Q@({NUBs;RfOibVmfZ= zp#hXD%WTwxuCj4Z)>j5;4XaYBIIfh;wzs6JzHxDBsA_pXQe9ZTB$`NJ(ieC9xk)mt zs-dZBeobwCMN?hr{Hhw;w7Xmd2a1oPj}ar+#A>Y@!o#7f-!9qVVjAXW=kHJLky zGR`i5>o8^ipLq!niYHcw;}Gu65xPx8%M9Pa^&K*GMjJh|<&CX5DHgHAWkG$=e$%&MWmmJ)kdpJL3KI@T*NSO*=|5m~RsCUTUc z$Ga1!O`?7+54~YUQ_bS)GIX;UO}x5j>QSU@HLxLBkS_~noMDoY+&0T~B;!0sp?QA` zJ*d1kw79y)DmJCN4Kjx6;*~FL+BeQlu>n#KkYb03CHj{yE!McoZDbyQsw8&M9E(bI zgp#}1tGML0(<)_F=D850X{8*Hd3;sMT*(qjWul_&=(~*BndjkI#+=OKYf5SkP^Fak zf&sFXt12&;`9$yjRDBVK#9gt^M5_mDXVokYg^;@VN}^*QE8%jqp;l`OdoE!bGm#W0 zej{vHJ{9i)0Hv^UA1leN!G~TN>nj?|7pUIxve*i?c>k1_#)U5HKK;(xe_3m0DgkZE zuuAD-<`qto5gwt;q|swHuESSJ4;)TZ+f1z(k0=l4a+pd=dzi~%&ZJNtSr+qtCL?Xn zt$DGjB(GXiw(n*-x+fptZl>J!<&@~}rnA{rCQ=&xl5PCbGw0}RKq z(ZCQCyoU19I!IL{={uH?93<}=mY=BUCB*>ry2dIf<|b`ywi%>9D?n^fsM%(mdBc=w zHH$|CR&4XEq5!>{*MAugDMs1$+pqWD@@f2libPB-DyfY2eM5t7_$g9Ihi zE7!b0JRptdRUq@eFA25sRUR&`aeBD8#_8eW8ts98$hw7)>Sl4z^QyiMQ&UNjrYH9V zdUB6Ix>}=hB%w;4MsEgs3*7(YIHGI#(EF^JU(K)Ca`}$w4clH>cjZFErZ*UeDp7_G zDO6Eu@1p3H-0u*%rSYZ*xs|U6xt$&^ayva-2KO4Vs84>xsEpO#MIJe+epR8={s{TXuvHc@* zmH{FwgQpW&`=%4w<>4f<%fm@z)5EN`$=_MBgK&|>kH7OQBIih~)_}joM7_HKBBjTi zixnnVc(~e%f$eE}w}x-%$%SJJAH5#NWIJv5w2YN>U=nS08(ZjXQks*}u$8yl&~PI& zY%i~wcV+ObomGE3<^9L5S{{0!pV*EeY^8CC2e!)B16!wu3tOj$3tR1xhV3CPTER-@)5Aq*?SWFsYFmwHf~%bL;z#H~ z9)vE?gvMN8yb~Ws?E4;6H=So?MCXS#i(hRzd+$llK6mKLN8P_@a6cLP7^1T@W_Zw9 z`FhaV>EWWY)5Aq)?U6?38U3R3U=KPE)^s*!X`Kmrv$EA6q%tD$)u)s`nm^{HJ^My( z-`DVi(C&Vcn6?mSNu$(*#LCx$#7++viJcxU5^Ik%5|=tDBJF;xd{9pkL#n4uPCHZV zgT|SOi?eptJsTUe@`$zND__0mlS)iO=~IBtoD`M3#6=y^SQ={8lsSj+%A?MM#wwcf zaM9T5;i9qjK&jl~qQ+HDdhw%iz6Xu%H3Mf--o%xi9?9a&82I)JCjaw$d1t)2v3B88 zYg47$`$^nWiMY~Op=#|SuJZLDuG7OsT&IVNxY`5tcN2GolOodYN8BMjiHlL=2rVOe zF0wci_9nF@D?*(hL!Wx-xg#2H9WUP7{e$11{n4GBrQQ7`^%^3zGDB)M}>J)*pY-vx^?? zCu!Fc1*L)Aqy(jlif zAAyJUBrwE;Ib@@)$cebeEt}RX+*WfIuJ7*=(4?#Vx#r%c%`g*66VVM=(eu5SpH2#` z?!fo6&23HA=e*G!;E%R%V<%`qb0VHh;;Rki_V>PlkGKqW~c4?p?seGejDG2g{maj*O3 znx@U1F>U75W2ViVHS^eGnr6(Jdd$?BIgE3;nYY(3Tm!loKI@}D0ufK-FoVlac&Uxu zP3|28ypQiA>(sDsBWCZ-<7}k0tGvmz3yiZvY#+V)VQmuPY?$q7@2}u2-*#5hcN}w< z=1%k`=MDtUzGr)Q?Wp1Gu(SZ~-ECZbWkl`|Y%;egxF}?;+Q@BooE>bZ*rWU8_y&Mg zPBWTg;}K^^rulp9D&lNRS}?~}G*_j)_O-YusP>?E0b%Wo^YX+xrP@2>0$0~bZ8Y;L zreoI*$2Zz6VmP)GdF5v9iQ{av9m%9%ZH?Xl=&G37apWqVYg3CC^zJ=ooE4^J)?+Um z$45lz;6_vZe6&s9o%@caq4wRQv??y`m{)t*IU8a-={?|1H}lLR$Cv$Nwm2=rG2O8)U|m-@f3iK)t)p?O9pcTi30m ztd06sAbWSXRd(}qt`&x4uDa?RV!%9TAtk#s9fSjG7xAGtxsB9HMeBoTW%@49XWvdFZpt3CrvO&sL9b|)*tv1LGQnv30S-!G0 z1lbT}TO7m+mP~JHkQFG~vLMb-O1Bk3HeA_G4YCo+))ZtTl`R}(qm->V$PQLE)aVdp zTODMhl`R@%W0Y-ekR7UQ?Llm{l6k~~>@a0JJ;(}`Eg58ov#~^tt{^)?+13Zyk;=9q z$i^w#4}$o#p$zxKAe*3Un}TejvYj1dla%e8Aa0+M;m!-P$;x(qkWEpx3xez@WxFWI zik0o+AimNfWBe${rYhT|K{id9i1dzPT%zinn7EVhc9sr8t{9QGGUz7Dr0xREhs9 zu~sfIS{=#HBzmZx@h2?_vY)e?b5YV?=&+U4u0ix$l=E&#E=mGz1CF;U$J?kqx^@f( z*zJ%2v~#t@EL;w|6a0-2jB_?#=Sv$$N@`cF!Di7DCON(Ur=5cAF81p@_Frr-s){xD zzQ!W1(L)Zq2PJTg8UpM-$O+v}t>Hp|J%Fm(KYPJ4KC z^a1u1z}5ba9zMXHLE*i+_5gbhl~#Rvfc?cLlhv6A*bBC+)r$w%OQ5pONp;@=_E$S| zN536lucFg%bl3s5-%io$sRQhF^jv18tu8vi-b4Xa-yC3nr|!kM(=@=|v5D{QjRWjG z$Zwrsk8U`?-scPlad4w}X2V@#G1($=*#CfQ>>fD4K0)p1U3b3$_L*`p``!TiC-@&7 zZ-9LXZZLb@0Q(mbvb)>>!&X{#-X_4lMGSPd0glysb$BVj1-fCYn+@4$WxCwd<07A>P7>66q=cZIXch)KLlCZU1xxgK?rB38Q|ZeqOQZ1KdcG^{E1Z_ zA_R$4bT>!jsX_=mdAg%SiXHm$`FfJ8Is6DPoD@~kLvLiu;p5N|BTqPJXd z4e+A@KMrX05SS`4m%!9cK|Yfo1L4h&1;_Wyy{xOXHIm5T$AMvpYLVL39tnF$Vk_Yj z_=&l^grl6pox-H@DPG&I=a@~0=x$3Yai!AQGnM06YZf_HUhjJ^wVxV zWioHH6T(>0n!X6|C14|c(Xq2dos9Igvz7jGYFFwDBl!GSfS+PVwLf+h;42|WbudU4 zOOWu>?BLGUxk?Hg`P~u{5CIOtyFO$R;DFry{fq!_v&)A}=(7z0zQ)eLA(?m#eUvT_ zA_S6AitIb z)yMog(9#T50r)|Q2*T#7lV<4eA{cMuBb=B>nvN$l5!eLjA@T_=L_VQ|$R{)q`Go!< zpU^(!6S{|dLi3PM=pFJ2twTPcbI2z&4*7(>A)nAT;-)TxX{w}cSU!zIYs=}Y%UpPWXvO@l8gmpEF>dDMhzKtWYm+< zNX8N}P9|eH8K;o3l8n>HSVcw)8Lecrk+Fu17#SU8bdr%EBSpqKGP=pwNX8jtoJq!6 zWNaqmTr#$hv6YMq$=F85C1m`VjLXQ_PR12v>?GrAGOi)xIx?;&V;6m`gtHrAJ_EIj zwqa&L1sw?Gb1>A-0w|oLplTipC37s)%Lz~{r+~!?h-08oo&Z&HE|ka$sE-TbTML!3 z5z68+sEI3~AT}d(86dD`W2GF+Z@xh#jv z^DdWD;PQW5E-T^kqRZtpxV-FgSp}C@TrMqedCle03YWjRT-xCBhRbCQT;6iI#NhI_ z%cTP@@48$%;qnicO9Cz*xLi^;V{{i-px8q0QVVB;v; z#nwOzU(5Ev^#w5fd#r*R&(bUvLW_&k>6OIV7xu`a%mt>fF+dVU@2=C`vA z{1LX1KgWK+|Bgl?Xc9p&9{-hQyjm3UBVEXkA7&quw3s~fQ-*c+rewt6#x&DJzDN;Q{bUL zKnaGc67Z1^^N}Qx;dHRe=^Anx?Q*(~oDOw4T~AJjxttu5Ty^W$p-w-AT)rOi^ad6J zb2g#;oELHoQ8;y+S$I2=I>P}kpp4i(ofYKOqp`x8l>=Y;I~u=N@Ou}(&msBHVRC#L zksplTIQ*vJHygi2_+gophwvxFgWse0J&oUM_`QeUmlzFU2qA{xhbAQ^;5QvV zq#+jI*MQ$j{G#}!@Y{snh4}5j?|S^O%Sr6T?=k$I!EZl)*p(x`!JUG+_>IDEJbviO zj57R?j-1Y0VD@vmTArmP>rxmeF4@cW&IPZVP$;;)@EhB8`g-j z?tyi+vfcn|R9UZpb*-{q1Z%spo&{@MS-W68U0K(_npD;%Si6+95vA|m%hyT5^GdvJ zwBBanZJYI0gtwj6+ZeoUx84ThZL9Uh@OGB@#y-K@h1T1fcw1+^{RMAZthe9e?F#i) zz)`3(u3`g$+|6u|?SZ!&@OFj_cIIBbS%x`RV!Q>O=fd+6>A4ke>+rVOO1}+nh(dMU z$Eb4prGQ_EZ1(a?3iyweWiP+{YBs_dV#i*7)m1DXPUor=RH<|d$SMys{Rz=@%I#?L za%9NwLpR3QZYkCFvpXOS?qu&n4t~z=W?!=VAr&6rS(yAC#D2^3+3z47_VF>8qaDZo z0IB$ANQtNT49uC%X3z7v>_te6mmnoyg~WJ`FJo^&YP`u?FekZ-y~}T6A3%D1i0<$c zNRUtY{p<@!kuUi^%=A6Y{>`7`oWF)?z1J~)_a4vTAMiZ>B_`&+=J_I<4-o_Ta503B z5X1N(VhkTG4&#T33A|7g@gv1_K2FT!lf-OZB z@?O7bd9UBJyw`79-m5oL-s?9l@AaFO_xerCdwTPf_d1xC_jv1F-ow)&?{!2i@9E8w z_w?c~?^OtwyeB71-qVYpyyuT$l(>)W=TAZ^{{c%se`cTaryz+*0zZ$Hlo$CR{t^~F zUgZZvB9Gy3U=83+O#8pXr}20B3`pkL{6oxef5I2>PcftX1?GIezTnguf<6^VcEC-xG!W192q(QjFtY zi%B9|6p4YNSPT&*VwgBuj1e=$VPck;AdZ92Y%yKT5i>;@Y~^CEm@gLK-y#tb4We2s z5#JXpMZE~a78OfHOso(oaf(-cTg`!nlEY^q}Vy)OI;^KPIDQ-ll-J(m} zCN_w@VxzcMoGBhdjK{?};u&$ScwTH3`^5#~4aEFVTp~Uemx*u0<>EVWrI9Ok8iT|& z#wc;EF-rjHA{TL2Z>KH%Km~MEWYGpFp3=~{>>*E zoKG_ZpJ8P4*+veZYvl1oMv&JS`Fx2ngfBCO^RO|3w-|?D)H<5qWE_T(Y9YVfIFjFE zjN|uX#QUgG#P=D+{Ar_vKW7}xU&9Fabz>HP&p3{MV9e%U8guy9kdE0#xfp277ekB% zVwe#UV~lEXnDKov!KfES#u72zSSn^3E5vN$6fxI0O)N0NVv!LM4MwY2VyqD>jkO|d z#6{HT6fq+uQbw0pZ)^~ojE!Qmai+M?*d#7C&JjC|b0Mj>it8bLZ!|83WWGe)W?Tko ze7U$6lK3%WCnWDR;u+&w@w{<^*bmA4hVgUpp>ebL*w`(;G4_b>jN6S|;|^nx@oQt0 zvDX-F+-Hn8P+Q|6V}|jtajfx}QD*$ks4$)|qQ;X(%=m9(i}7dU0^?a@yYZZHrSXEX z%Xrba$#})M(|8pwuNiL}`;Bk${+;o+EMdHrm1}$ed4B_RGc0AK*l^Fy$tmW0%MC4+ Q%AMN_vHhr7@2^h$U-X5(3IG5A literal 42737 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 o<4p+Utr*Q - + - @@ -29,7 +28,8 @@ - + + @@ -103,8 +103,8 @@ </textField> </band> - - + + @@ -287,7 +287,7 @@ - + @@ -420,7 +420,7 @@ - + @@ -469,7 +469,10 @@ - + diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/utilitarios/RelatorioGratuidadeARTESPBean.java b/src/java/com/rjconsultores/ventaboletos/relatorios/utilitarios/RelatorioGratuidadeARTESPBean.java index c26dce7d1..64cbcf4ab 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/utilitarios/RelatorioGratuidadeARTESPBean.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/utilitarios/RelatorioGratuidadeARTESPBean.java @@ -19,7 +19,8 @@ public class RelatorioGratuidadeARTESPBean { private String RG; private String CPF; private String endereco; - private String telEmail; + private String tel; + private String email; private Boolean desistencia; private BigDecimal vlrGratuidade; @@ -136,12 +137,20 @@ public class RelatorioGratuidadeARTESPBean { this.endereco = endereco; } - public String getTelEmail() { - return telEmail; + public String getTel() { + return tel; } - public void setTelEmail(String telEmail) { - this.telEmail = telEmail; + public void setTel(String tel) { + this.tel = tel; + } + + public String getEmail() { + return email; + } + + public void setEmail(String email) { + this.email = email; } public Boolean getDesistencia() {