From 7656c4206e36ee217f409bbc692f662868d9c034 Mon Sep 17 00:00:00 2001 From: emerson Date: Mon, 26 Nov 2018 17:41:16 +0000 Subject: [PATCH] fixes bug#0012791 dev: fabricio qua: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Ajustes efetuados, conforme evidência em anexo. git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@87359 d1611594-4594-4d17-8e1d-87c2c4800839 --- .../impl/RelatorioGratuidadeARTESP.java | 4 +- .../RelatorioGratuidadeARTESP_es.properties | 3 +- ...RelatorioGratuidadeARTESP_pt_BR.properties | 3 +- .../RelatorioGratuidadeARTESP.jasper | Bin 43470 -> 44562 bytes .../templates/RelatorioGratuidadeARTESP.jrxml | 55 +++++++++++++----- .../RelatorioGratuidadeARTESPBean.java | 9 +++ 6 files changed, 56 insertions(+), 18 deletions(-) diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioGratuidadeARTESP.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioGratuidadeARTESP.java index 5f18c7b39..c1af485bc 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioGratuidadeARTESP.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioGratuidadeARTESP.java @@ -90,6 +90,7 @@ public class RelatorioGratuidadeARTESP extends Relatorio { bean.setNumBilhete(rset.getString("numBilhete")); bean.setNomeIdoso(rset.getString("NOMBPASAJERO")); bean.setRG(rset.getString("RG")); + bean.setUfOrgaoDoc(rset.getString("uforgaodoc")); bean.setCPF(rset.getString("CPF")); bean.setTel(rset.getString("tel")); bean.setEmail(rset.getString("email")); @@ -146,6 +147,7 @@ public class RelatorioGratuidadeARTESP extends Relatorio { sql.append("WHEN b.DESCNUMDOC IS NOT NULL "); sql.append("THEN b.DESCNUMDOC ELSE c.NUMIDENTIFICAUNO "); sql.append("END AS RG, "); + sql.append("b.descorgaodoc uforgaodoc, "); sql.append("CASE "); sql.append("WHEN b.DESCNUMDOC2 IS NOT NULL "); sql.append("THEN b.DESCNUMDOC2 ELSE c.NUMIDENTIFICADOS "); @@ -197,7 +199,7 @@ public class RelatorioGratuidadeARTESP extends Relatorio { sql.append(" ori.cveparada, ori.descparada, des.cveparada, B.NUMASIENTO, des.descparada, "); 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(" T.IMPORTEOUTROS, T.IMPORTEPEDAGIO, T.IMPORTESEGURO, T.IMPORTETAXAEMBARQUE, T.IMPORTETPP, b.descorgaodoc, "); 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/internacionalizacao/RelatorioGratuidadeARTESP_es.properties b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioGratuidadeARTESP_es.properties index b7cf33297..399f4f274 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioGratuidadeARTESP_es.properties +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioGratuidadeARTESP_es.properties @@ -19,7 +19,7 @@ header.periodo.venda=Per detail.tipopassagem=Tipo Passagem detail.empresa=Empresa detail.dataViagem=Data Viagem -detail.horaViagem=Horário +detail.horaViagem=Horário da Viagem detail.origem=Origem detail.destino=Destino detail.poltrona=Poltrona @@ -27,6 +27,7 @@ detail.linha=Linha detail.numBilhete=N° Bilhete detail.nome=Nome detail.rg=RG +detail.ufOrgaoEmissor=UF do órgão emissor detail.cpf=CPF detail.endereco=Endereço detail.telEmail=Tel/E-mail diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioGratuidadeARTESP_pt_BR.properties b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioGratuidadeARTESP_pt_BR.properties index 049c911b3..46a212bb9 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioGratuidadeARTESP_pt_BR.properties +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioGratuidadeARTESP_pt_BR.properties @@ -20,7 +20,7 @@ header.tipopassagem=Tipo Passagem\: detail.empresa=Empresa detail.dataViagem=Data Viagem -detail.horaViagem=Horário +detail.horaViagem=Horário da Viagem detail.origem=Origem detail.destino=Destino detail.poltrona=Poltrona @@ -28,6 +28,7 @@ detail.linha=Linha detail.numBilhete=N° Bilhete detail.nome=Nome detail.rg=RG +detail.ufOrgaoEmissor=UF do órgão emissor detail.cpf=CPF detail.endereco=Endereço detail.telEmail=Tel/\nE-mail diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioGratuidadeARTESP.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioGratuidadeARTESP.jasper index d5955fc9d23ff3a03e0ed787850a299f070a96be..dfd4e3f7cf4a8d330b511b3d65ef20acdb590dae 100644 GIT binary patch literal 44562 zcmeHwd3;sH+5gO(3tYk_goIV01`uUU5CLUzNx}^Tvo#6GqQpybLoVFphI?-yC>2ow z6_=_|#eM6Gf?8h}q;;uF>r!oB?V_zqYx`=o*4DbVYHNSrXJ*cpdvbE~`SJPv^K0PF znKR3CW}fde&&)G3XU^S!Vf|7`HmNL|aEJ9$gqoN78IW<+{kmNO3GtTpvxwBJtSSku~w?{7N=dC##OM zMe93TT4G&kmah`WBkgO8>(j|t`&uL%tP>{7;*nHp13QH7uGb^hwCazDjS!D>*_0NsvDP9EUaLmHHmaO(N+~nqLLLV_31ZGtSrV|||wcJgu(e~;D zA=t3FBU;IF)(iU#(KMUbOGcRt+4?s}(~($Q7iX}#t2ZlpY;ROlLeR-?NhI4M>GDWZI+5IL zOE_2_Ym@D*KAKLmA*x|?rekrmBPw^08c8RRl?|ej<)U$e~O@mR2mD$uhr?U1}SUS)xp@)4bZ&9@Z(Aa8*|i^u^f0rJ!8fa3Zc7UtmE7yJI+sU z5>`dsn;_+3{WsKgpy!zC_Y{YACRL$GQ0FngUpMz} zjgrDz$)F1BJL0i)Nj#p|6m70#1yWFmN8zrHWHgnM>Sl^BTbIAhsGbtXstfhj5xY0EUrb97^+o72?Wl@JDN7JQjupNS^m25a9EuD;} zn_8(~uGtt(wm{@6*|11^Q)?ngV;5VBsEv<6zh^&2BG7xMB9lQ#3hbOz!0fd{*i|tp zF6cnOY26ld$wphXE0M*|DEde%0re!^qF1p3M|2WZ$7lvB@%Y|U;$oA_wGo{Qbsb~T zs*AQnA(BnqpI6C_u+lUn67h7bqg#n8nO$Ia<2Rv*rAncy)=TZ#8IPw~fwO6XXf)D} z!sOU8Ksl+U$Pg4<-w)`Bq*2{=eLGa&b}JC{EiUn^6_*>FC;M z5+s8y7{`&+Yd*;PdNgXfKNb>UmpW~}(q%K_SrmID~ zKk!Y&o9PKhqj0fQ1s)u0()WX7soLh2aNC+_b92;8G(@)O*!pNgE7arKR-HCP!5Ahq zlbX?CgJP+r?cg^=LDmnCkYjEaLx<2PJd>S+C|EO-$bmNlh)!t&W=?P8uu7E>{2oMk zw7o%O0DGPzNb@g?0T_|gbWGlnX6)=Bs*rccw*+376*faMvNjp%Xic-pzUVBeqgE}G zQh7VT@b;zz$&jW@LFI0#QHF<$jd{`*$>d{5hPxRVOeU0}qd79zyw~g~_ARg!r#ekR z^MY(2S8;N!0B0M?L8!YZL(wCoV@;XTJ|ZJR7j9PXgYj?g(syDpUGkl8^Z5K zv@NkQN|Hw@q#`b5p^iiC%$wg^i2D6^j-(U{tNl zG&vNf>OZ>I`1`eO+lyfZEMXyxdQ$27*xJ%qI<IjL?IyY5F#z!3NdK~MbwjvL7ML6qG+V_B1-ns zpzebr0u}xEKs{0-E6Ts+lc7uVVTrEVC=D|)AnPil!4Vz>t<{@>g?v_O>RY{r6g0|+ z%28=~Mkj7`STWw+C|T2X?#$k;KlOK-Mwet}wiYOgUMeS2k=^Df%^zetZ>yMQ=jHYQ zig1_=Qd9hd#xcp@Dnoz2?hxS8=*rpW%K%GPL-FTQ3K^i)R2G&z$(GEbm6RkZr)1M? zsKX+Wlf@(`9Z}3VXDukGpp{xHIwkulmHg?+WOU-_rqwaIE z)X?2ZZ8JcWvH)?s5*KZli>{7-(3)z+r3jM>k!3MVR<$`K1YH$LPGQD~Z;A<%l&m~T zq(^+@J%LD&XP(Ty;QG8&8-H*?aDRLLnwN9R6P`mMN?#&#m02Z_*~6+36`l%EW{^&s zN>=BS%tKGA{3>FZSuQGyGh(?PO{bosjAxjYcQaCRS82rsHkW8fiuzr zoE!~KQ%8%7UeCZ71F{BY|FSEtEyz9U-Yb{w`@CyL)k}vFnB7!c>0Idtj7sJKj5ERn zM%LLHm^f2-BcxOGh|rZTj%I_PmCugYKH}7-!wA$q0!lh}_yMJoc>v{%FoBYy?u_upN2ll!pF3QP%m$y)9{A+z z7StR~VT}um7qM(r9Fu)eRx0k|WB&f}@BehhGdF#9?T$60DnC1n0DYeTlFmUtfK)OM zfSeI7fSeKD0O=Gx0(7v?03G20klBD}Pe}ITgEi>FF3Y+B?K*hI-5<}p>-b;9c79U0 zzxt%Zh|ddzk93~%!$&3az{eTk!p9lmjgL;zBR4L{=klZoZkMMSv7+XBQkFiGSYd?4;hur0~u$83mIpGH!?a!kI1~%XJp2B zAcGB2w6m!Q_G4>SN)1C-wl(WUb3@U_L7i9a``4}e?>n=iz2=?62+fBCjdVWngGMFu zfW{f&g2ox)4UJCGBQziM8Je*k(CBSuMOX{X(%>O%Ud|eu>woxm`qq!y?%CA!^Sc|b ztyp^au;CooNQZsxgN;s>iH$45iH$456B{!{kJx@tgY2&-AN=^;Dfg7Y8uOT#rxws>gNGLoIMT`U14kwE0LK~O0>>HQ z4USIH6F5B2#Yo&x4bP&w6XWogVT~T;0ggEuz=pNbSiBV*S6pOMM6^&7wGGnA7*78; zJtM2p+Jis%a`g+pE!_3utS>qzZm2%-Fyb?j@R81VKYUa&4}6>vE_|F3-uUPgJ>oOo z#mH>%DfGZ+i0*UJ(Rdg;R^u+BJ)koV*iXnBovY6ux8~$8?l|+3_X`@v|1EsSVMONy zLPt8Y{LoR!JkW7QxX^J%c%!3J^oY(Z7bCMlXPgf@9oU1FOtfb;C^#8yCzUli2aE5y zXx&qHemUY~<1aH0owoNdqEkWWNT=Kn9hJ-j9cP3K9cP3$Iyyy<=#=*vo$)^CL}{xM zb}qPx_Rw~U&~`q|8l8*&aee8H_s9Qt#Oo*A_txfx#~wy>RuMYVS?-69O6Gx%Gs1Z z!KNuJ)lBSdsYbpg)762s7M0Xztwko?^X9o9T>6vkv+V^IFpdqEqVx?s-`rA7p@k$1 z2(t$>nN}L#qUuZO<w~YG?Y|UhU*&|Yf6`d%Npdv799E|e|}1F`IJA6 z{oP5c|4{l1OYod??=mSZ_zsZ6r#`HX@C#88<(%u5L`l<}tkuap#8Kt<5JzW(DUOOJ z%1I00Ce0qT!ns;VtPAn%EX{2qk})2g*j+A-G{XdZstNDJIIK8GonuQ)soI+S)57F= zzq;Yezhb?9rMX_;A>~w-y3iA4x4oBvGSzac%)a0|x4n1y#h?D<%HMo2w*QCEF2P!k zw@JY-=re@Z(qp8v#}7i4%mYGagiE71BfKHhDSCu(kAyEi{$r1m1 z$=^>LUh~9Z1m|Z|Qt7aLJq=@x$f7%AJoDoqb!uxp}w0ac)z^{~ShKKBkgN=R-eSR5A}-oDnWu zoDtr*=oCHT@?oEGnd*T{u=~77Z_s3}GWtPt#XJ9%w|D%3V}izCw|@3=)GadU^ae`i&M-evZcK0d`Of#gbJLaI9e@7I;hM6;2+AY^MLHAxKvBs&KygO6 zKygNRgQ8RP2+Bm0ndY@uP>MW2G0JMKS;^i|$(-W#L*>qspPAqJ-#3m~d{S-u-(RoZ zei%`iN2o~W1V2<%G7nUo5iV4m5#Ffi6g{FM=T%HZ=-MkP#TF`tv?AAGx*%xI?Wz!- zW+RKD8#*KL)THs#3a1y3pImrK;rQ`|^9nPwm=Es_&CI=HerW#i(}|Dm-*a#N_g8)Q z%!_XcanFpHA2p5{p2yZlXiXPFdGMQ;!dqs1Gg{H8ep_v17)0hS5 z=)#juDoiIkql9FAMHPWLzWV74YODpe-T;J>?6ynO55Qa2ocj1L&yQa?cJ8KUMh{we z7^i+jGXW@_h#!C|nFoN*2opfbCv)OYKS5>nMpD!05y^;&pn2^T$>S^}^(JSu%fTDt z$we7EG&N9YwiBjJm@uPg#tc=`%-Ook4FGylSk^ zSyN=`J+GmDFQu+zIOe1Z?+ll+k(+RkLR~bK=u9?6tFV}fV>TM_dKBIeYoVi&u!i>b>X&XAD$<4i=p!7{jMlZYJWh2R)Qk+z%PF=&{Cb_AmWUK?Hu%+z-_E1zS z6qW6@sP!g^`IHkU?npjnmD5a&^2yT)sBW`xtlY*34#dP^m>@E_H%=|nX+dL54?>_{ zM?Sgt!zk!D4i71kFDI+E!WovOl_>cvODjw`m6J(H@mPn>NG&F3u{r$ z)rVo=069AMj6#p>US9V>jyPuyZ)@WZ$5q%bYU9`kv}&m%#dC;qtQAwQBWR}IKLe_! z7bdgI;9SbgE{D0imR)Mcl24Wy>}81TGFVfv*(Fyq>Di@qj2yGeV9z;bmmc$A*(Id8 zne0-!<_mfk7;{9`drEuo(|g+PX0FbWxyiv6b+uaI$R4?G8@$3$3JPTbm<>|A=nOg5i z=#jp>?Jv7MTbT@$r&^XLl2A4nsX_y+WOP*7X1rb2hU1HH1^~{v9HEatlB&L2&)uu) z%xy?nv76JL4Qi7~c7<3)j}vH8hsh;0%`K4GLGKt|t5S z2kOXFI$Hp*c*|VI5sKn)O|iD5uB0lAgI($yt4eB}ga=E>kmuY$ow_m)UQ$wD8?M9o zJ5(xXrmWAkcF`MZSFajdp>SlhlcqZRGPNOIgo?DQ^L<^}^K|yAlI7sgQVbm(vg&9R z`ZOI^-h7>RVM#+tV|~rix-#{4xo%Vb^^u1i*UM3ni>O(k`m(x;+J?%ot3btmfGw#j zS%c%6aAvVJDsoXCtczP&Q&v*xDyeFd60XVwj!lcY@{Q2>>cXmyjipPgaX^DiqpLc~ z#@ighsG**VkXf~cimGtq%9?5yiF}&`owB(y(e5sVDRkvEbyXz|jpZd}4K;NuoQ3c; zA7tgwknK~QT}3OEG?<5SlI`vOX`-zl4(rT@lHfL%5(vrH0n#PKS&N^oHdBgyyQ<_k+B@-=EwV(FN77|HI3$OF9+KG zoCxADS=s+*U$r3#+CmKF-V~*?c$CiYts5e#K#Vr$_Lt`!_fNABj>D&O-HXmnB-&ty zn723<)bhjNJ=I(PcFC+=aeRfLt0~^u9F^|^#@dV4N247@^0=TP+J9U$GtExvjYLwO z&sYTJr8gJRF+I_uHPQ5@Xtcd3nb-uYwDkXi0*+9`rxH?K*1lHR!WTzUt>~xw4S4Oz zr$?OivcW_-jx&OaQz{7`D@eD(gvZ&F&0QU*oGQmh{Wk@1rC)!N<;yYQLJKA2-<4*3 z26-;Vwqq*(a#uh9p`G z?ppt5>4;<8+j%rZ}z&b7)RCx`$7!vT`{Rw$KDKhgi(&NLDhS2!!BpLwK3%j(OzpKo+j4@q2y z9brHnYsX=v&^mNlVa9;kIq{GqdFQMV%{3`*>e^&+5L}&^Mc1USGZ&0)`YV<^SXKu} zb^}X^m1`EWfBlO3hA@^jvpQ2N0}2m{fod9UDZPh9MaH^M)nf5_RC{!j8l1>sjvnw% zI&Ly`Y=h7ph8wGwR+XZk&1$OF#Z!+W^;aVsQU*n`V8(SO8!7A-xhQYk?kF_xYoQ01 z)l@F6sX)YX$VNQL(CF=doInUyUJ~3pMQpAcE}uzN_&LJ z9q=kHg&nj?8OZ)A1ZhSo`(>YBl`=<)gtD2aC=c{r#{Stq!?TP7vd^zMsU<*_QsN5% z=&wRmc_GXTygO9&K_yamMLtur9-8 zC(|mci&dCO=sC1iRyl7dC1DstD(~kUE=+aIQMJBFt4MCn=Ojmc?9cGTyMt zXnHhzBzx5c9s6jr+1=#;N1NrerPdayZ{nCFRDd`7+Tw zpiQ)x#k0lcBUy8KZ=RlKyeYFUxb(@d4(|UXal@sX4qm?H#?v;KQlKA7Z-$MK>{e@Z zL`Y`zlA6y+YNYdtO5~Cn6{{j#QsazpNsTkYB{ez%{g8EtCp8I6dOlJ0b+~@g6YMTM z0(7-Wu%Uj?HAZE5gZcSA>(@W`tQ5lg$C)x=KJt7{7e)CrlgU<>Bx)e$+why16_dB`cqixaQwzTL@#>b&su!wG=p&QI z5tF5Jln0YltOt{w5iTY>BV0_@5gANA%Ec18@niBJi^&5d_trta#U#BY1uCW6q>Gg% zR5(uUpTV9&y~V~i_0+=gg-_oCXR1xxJuhRC4o;^1iQ@~MO-f5r2Db8WC>m~LhwatX z3$F>CcWuS*&-ma+dskLI+DB|@M{YnmCwgG3Vm+{RM!2wbM!2xm5gFK?*e7g57Pj`; zsl#*w!ndhniRMJnMmd${B%9HQh`s6*E=)YIv$ASLw@lvt`DvB+Y@blwe$hj>EwZ<) zIiI9h<t5^>{J0o0t zc1F1PtRph`Y=2F`WVaumb3OQ+tNCnB)0%YX>MhDve~`|K#n+ut@^s#q*Y191U0~O9FcxM77yvpVrcb@*=Z-m zUU;0Hx;XFJ+F!&6ub!~JZ1ryseO!)dDE;cD^GS+JUh0B2^8}=$4-j$jSjBqq*csvC zu`|NOV;zA~$!c3XwsvM(<@Muno(GTZMFWe3`IJIUiv~1q9g&>?-*@rU&%ZHf%iCwy zEO}{tx@31BnR^Z~S2~+jtzFDju^!BIM!1;kjBqhmN0`;Nn7i4@5$X41?$GYc#i((F z))C!TS)7D>k>kp&bj5`u8tyqpyno=F=eB)#e@97IA6b17v06GiJXoz_Jy`9GaIxAM z;bOIp$YAvjCr5f^b$)kNLsyu~fKEcaur|A%Zg;$;s_WL9&p7_kP4jmB;(*7IdP#&SUSvTK96Klbkn$<=B{pY}v`~ zcl#Z2)hDmq_tn#f-kJE;@FjgUE^i|SOXn632CG;P20J5M40cAi7_1{Q7>v30ZhwAi zVpw+uLrs`NHrl+LOn4kpYt6!4WX{6%{y7htbhW>B-qW-hWc1{2EZAAwBZ|jM+=&giBt+7Jt@P6FP#ARh!?R|My4~?mNH{TIKJoY zj>R|gBy`3Vdf7BjE}Q1j6T3+GJR`8SDOQ!<{mICG^ba=$a~@|St$pZ?u5Dl(laA)5^G4_10nU!FBlNO}wS9=Q zVRodw^MbQHJ6O%@arO;6$ZJatXGdiuaBpwp>LWdJgJ7e%Pr=0@Yt=^Xv*T>EO|e_| z$?*vdtGZ@3$Ic_p#$?1hHkomDbVjttt|M2ay*9SE7^OC$c=6lX8s`;>bxO5)$OW#h zliF$KRU5~)9ga^NTFh|lDe`)nwJDCXBkfEk2WzVJ4nSAM)RrSx@m#xFyr6e)GUKc; z<6+%4!*P6rmtOT~tXqV(>ATn8(KOUfeUw(^r9Jj)_d91p?I68t+!0oIB>m>W7ZzRnEjug7-kQtVAeBwNL1hudu4XGniUz0eUQrFL!y7moZ03|-li{pD z-Mikuv>s{if44|kyZx<1_7-!iI_6u}RvJ>n>f-@W0Os2ovJ=oNy__AFEdu7|j``3) z7Ae=VF~rk~umlbJL{VES++GQFrgpA9a@KzVZE84~Gh@=^Wt;`d@afSIo6i>HumC$b z#QL%R1DRl_hS&h*D-B_HjSO2DVgr@0Jj8O8Z*hnXQobc27E->-5F4y~)ghLve6=Aq zMEUAMEKm6wLTsq=Eel~$OFm%l}@x_i()gj?xi`K zF-d)rkXBBL=_M8aTN1Jy61iGZt|@e1-SbZd`ggJYIVkA?owl4>cq+v1QNi~@tq}>d z5(M6-0{@#@rfWZ8kUaohK>J#Y&B6^}4?)t`Mp5o#^mA!fNpa1Zb=XQef3oB2iaIF7 z9%hFIv4iaUs45oZdmE^@h86?ZBPfAuND*X@areMK$bJYNqT8@FhzPPLQF(jx5M)oI zv8rK1ko_1cM(1#C!40x!(bRQ}d!P_x&x38|2qDN`0KY87A%_M*_ER9GYIX5J z_9nQjpQ!rwAp4zNI7g=*WWPuE;pokS?0;>FRyQ7G@1R>VD{b}PLG~^Rs5{sK*|33ltFgX}}j@Lo@leU#l;m_$srhym;q$cWuN2ia$+9o_4` zImrI50?dv%$i9I5qgM{HuOJO(mmFmO0wKFU4zhpa-tLTpoO7mL=LvF*zv<L3klpHZgM28W?H)JC3s6+EyAAT; zh_(CLARmb;%AQVb0}JxeTyA{GrlmrI$d@Vy@FP)5R|gy9W6@A889>(>?D(Xh;55y8Ogke&Jhe`pFa92}QzOYxyx$LB+t^95)D-Jf3C+0qhC4&Zpy z0ODG-rllKU56x^5K9!f`@L9Z+812y9W?3YY7Uu9%coX^GVLuxmGG5`Hdh_5J4V8o6-5T@>q|ir$g|j9Zoq8@;1ACcnEzW zCCC%@100%)Z$O`=b3?Dm4?+Yvnw1%7={VkL2in?X6I74Ro?IK`n;}d3R;xdK40w>A zlfyoxCKRAUl!E+RNRm2Mshjwj61y_Q&*R%jK+i|XZOPX!Xbj*Nf)i`h(apN~VhoO4 zJNV8VzMWr$hK93!g8ULZlMeR@@=GB}k`TSzSZu%CIDlV{m4xX*{%v4rpK-z2i5?=J zA>rPw_9}igm3=n|HwO84&_MOE7$JTw6>t{ci*nJK7eRhKG=<`YeI7gfS?$enL4GSF#Z;X&akS4t&};BW-h}uaq{BYt-vuwtRAER4I1xqK9QDc?y2dCQ zhmm6d6H>?H3iAa%LB@-`!gP^W7%uV(vqfHEw8$$=7I}riBCjx4yuwtGR~Rbt z3NuAsVWh|_OcZ&Afg-OkPvjNGiM+xzkyjWd@(Qy=USX8TD@+o3g+U^(Fh}GS#)!Pa z6p>dLBJv6|L|$Qp$SX_`d4&NYuP{I46~>3W!t{_=7#{KpvqN5CbjT}A4ta&aA+Inu z3t+O2 zg0VUlX6kqtsK>%Iod$U)ROY}WoeyL5RG6V*7@$iKTLYuB0p{ik7@DhLVm2XlE6mC^ z7?ju@$~M7>+=ATOU^wnTd)WnJ@!NRr9#FduM&ivd5AT3sco$5Sc2_Bvb0-on%0Vdd<7wupVm7PC)T1^WV}`I?=^4b+FTee6z! zJf5anYTlHo53{?cOnaDpZ_4zC+5I*bsQ!$dj&{5pQw%FGX|NJ`U>+(8Vm-rKL15Xt zQ>NxW_V+7)spLSA!)G$P~; zS4adQzjcK)A>=JrNE9J|aD}Wz$lI=v7()K&3R#bk_go=u2zlQXl0e7@u8<7~`Kv1= zg^<6wLON~1NTMk)wgv*#1fg$+z(yf#Ef9~jEDj+*m&G8;>)35r@k?13zlm+;_p!72Q|ui6OSXmok$nq- zh6xBIc>Fmnc+Du}$GVW8KEXaEwJ|mSb63b_g#5!5at=bibcK8iA^&uRY(>b|u8?h0 zrWSDK3c7%Tgezz}1qEC|J1MBYE9hbh3c7-JQBaO6=rRflxq_~spj=nbl@yfc3c8wt z@?AlDC}@}~=o$(d;R@PIL8Dwj*W0MqVGfY7?Ld78P~QpEF9PZp1NBRQ@h&WoUdpaw zm$C1%%b}>QU@t%he#@?8AF-==fL+Z;vfX?N+rv*{-{H0F8s5aN1*(`q(hBKPg(^FX zN^yiL1t0SSA4BRILEmr%-AqA+uAo~fXuK=vb_zP$735I!Y5;HxRQs(^+PAT}>~>ZO zrQ3))a6XYA1Ir2DP=Xrdd@^;Hn4UE7j|Halsw1(c8<>Px`lIgR9sEAR?_W@f1MwS< z-#GkmUMHW6Ul_l7{8r-^!w>n<>oEQVelOtn8~kuCG5?sxO!#5@nHY^9&K?wWuI@bi zKtt5xhc5`xPG_+Jzb*Lf#P2HnZp80S{2ss$>w@BW{9eTmWfPy^*hzHt#t{6*;x`pP zl*?Fz-%|WQ$JmSCKKxLwKt6tjkMOB00uS?|s(r>hhrh_-A5VTmr5WJ}&#}YB*LJx0 z*b)B6DG##K4)U2#@L5&+#IGOWb5=aePk{HQQwsRpgZw0TpF)}vmF5{X;}L$!3OnEs zFMF7m7x2Xgc_l(OsARY~$ZPkp{sp`a1h#=zgQB$&-etXu}F4?N|q1rYULdO?^)8z{|WCJ<^2fWX65}Oye-Q6I=rpQ z`x3nCl=sK*#+CO6@U|=O_u%bN-aFt;D(_x+)5?1}yc?DG0(iTWw+r60mA4JvEy}wF z71?}{e@kM(8*q1ybytqNE3CT{ad*9SHwAasSa)M^x68WA#oadRj^XYy^NxLtyG_>J z+qk>fx_bq8d(~Y5-+GW=u$K)4i2K-JJECeIMk)`oZ^>la5Aus;nq3m^%Mf`LBCnK@ zSK#hK++ASN--tVqrMf=Ds5<(lfM1En9OQcn_%+INkY9Hl8{tfG!$E$_UY3WTor;1g zm8O74jYbs8qZr8sfy1{Eho{|#)-1=B{3jUsF?3{teUH6|5#2}V9zTV${1?q|V{&>R zdz^>ZQ&1gG^HG>i9><>JN3$29LVn6;V9s|g`#E30UV$okl`qD8Y(0Aeo#$InDZl3t z%$vs8A9)zfqZ^2 zFr5D&P{JEbLtPX;1{5uGh!qq`g zkkvuZjom@$yB<3T{u0KWKWFdpSFkGeD%AJuSR#4@bAfL`P5+*U_&ZpK`6C|%)jf{? znIFwR#7e~9_zeCjp9?jTk{xv4K|IL>{rLPtN9ub%T76YM92lM?<@%M;) z{*Wl(hr~$!gc!x2hN^!-jO9NQabshQAB7|Gt>YKNi#YXJUq6;y7W5*&eezlflK!MnK$d3=wx2`QlDvthmc4 z6!#cY#l1$6xZjv79xxV&hmA$zkg-HOYAh9x8Oz0!#uo9Eu~j@{>=n-%H;5OEed0x9 zzj(=bNW5$u62CHjEM76*6|Wj!ieCqYieClt#cu+`#hZab@!P-z@rS@v@jg0;egEko z{?kGH|I*Y0iR)veae#(2KWIEJq_j^z=In`6c_9yez2{l;+^ z56|Wg8FTm{V;+CPn9rX!PT?;Yr}Cc}3;A!1Fn`0S;O}Bw{k~DnKQ?OkXGT5tOE(Au zDm2$vA%+@fiqXbuF~(RUjy9UavBp|aY_y7*MqJD@+Qdo51`#%rVzIGN)Eb*ay>X6M z1=YLSI8U?~+eFORE;blDMB2DSY%z9;t;Q8%r}1rZiLqN;W$Y1qpq_6ut`oNyH$k=E zEDjjAL!I9t4jOlg$Bnz7#_ti&8}~wW-w##&fOyS#SiA%E{hslt_{4Zjd~Q5xaN{W> zU_4_CF`hN@jTelu#*0Rw@scssc-bg2er3!xUNIIJuNjMs*Nr8{?~J9!TgGzZZDWh^ zj5@50d-qh5!Hn literal 43470 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 Q%AMN_vHhr7@2^h$U-X5(3IG5A diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioGratuidadeARTESP.jrxml b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioGratuidadeARTESP.jrxml index 5899afab5..683db9d3d 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioGratuidadeARTESP.jrxml +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioGratuidadeARTESP.jrxml @@ -1,7 +1,7 @@ - + @@ -32,6 +32,7 @@ + <band height="136"> <textField> @@ -179,7 +180,7 @@ <textFieldExpression><![CDATA[$R{detail.dataViagem}]]></textFieldExpression> </textField> <textField isStretchWithOverflow="true"> - <reportElement uuid="d36987f3-20aa-4e3d-8bb6-5cacf23aa933" stretchType="RelativeToBandHeight" x="436" y="0" width="98" height="20"/> + <reportElement uuid="d36987f3-20aa-4e3d-8bb6-5cacf23aa933" stretchType="RelativeToBandHeight" x="397" y="0" width="98" height="20"/> <box> <topPen lineWidth="0.5"/> <leftPen lineWidth="0.5"/> @@ -191,7 +192,7 @@ <textFieldExpression><![CDATA[$R{detail.nome}]]></textFieldExpression> </textField> <textField isStretchWithOverflow="true"> - <reportElement uuid="86f8576e-d934-4f0d-9b87-4a40bef953ab" stretchType="RelativeToBandHeight" x="363" y="0" width="37" height="20"/> + <reportElement uuid="86f8576e-d934-4f0d-9b87-4a40bef953ab" stretchType="RelativeToBandHeight" x="324" y="0" width="37" height="20"/> <box> <topPen lineWidth="0.5"/> <leftPen lineWidth="0.5"/> @@ -203,7 +204,7 @@ <textFieldExpression><![CDATA[$R{detail.linha}]]></textFieldExpression> </textField> <textField isStretchWithOverflow="true"> - <reportElement uuid="a1aab05d-496e-4fe5-9c2e-760b7592a7fd" stretchType="RelativeToBandHeight" x="127" y="0" width="103" height="20"/> + <reportElement uuid="a1aab05d-496e-4fe5-9c2e-760b7592a7fd" stretchType="RelativeToBandHeight" x="127" y="0" width="82" height="20"/> <box> <topPen lineWidth="0.5"/> <leftPen lineWidth="0.5"/> @@ -215,7 +216,7 @@ <textFieldExpression><![CDATA[$R{detail.origem}]]></textFieldExpression> </textField> <textField isStretchWithOverflow="true"> - <reportElement uuid="7778d2ac-5f98-4955-9bbf-e474a1f16dad" stretchType="RelativeToBandHeight" x="230" y="0" width="100" height="20"/> + <reportElement uuid="7778d2ac-5f98-4955-9bbf-e474a1f16dad" stretchType="RelativeToBandHeight" x="209" y="0" width="82" height="20"/> <box> <topPen lineWidth="0.5"/> <leftPen lineWidth="0.5"/> @@ -227,7 +228,7 @@ <textFieldExpression><![CDATA[$R{detail.destino}]]></textFieldExpression> </textField> <textField isStretchWithOverflow="true"> - <reportElement uuid="3eb6f2e7-2aad-4354-8cff-3938c90800ee" stretchType="RelativeToBandHeight" x="400" y="0" width="36" height="20"/> + <reportElement uuid="3eb6f2e7-2aad-4354-8cff-3938c90800ee" stretchType="RelativeToBandHeight" x="361" y="0" width="36" height="20"/> <box> <topPen lineWidth="0.5"/> <leftPen lineWidth="0.5"/> @@ -251,7 +252,7 @@ <textFieldExpression><![CDATA[$R{detail.telEmail}]]></textFieldExpression> </textField> <textField isStretchWithOverflow="true"> - <reportElement uuid="8aea1354-22f0-45a4-9382-21623ef9a45d" stretchType="RelativeToBandHeight" x="330" y="0" width="33" height="20"/> + <reportElement uuid="8aea1354-22f0-45a4-9382-21623ef9a45d" stretchType="RelativeToBandHeight" x="291" y="0" width="33" height="20"/> <box> <topPen lineWidth="0.5"/> <leftPen lineWidth="0.5"/> @@ -275,7 +276,7 @@ <textFieldExpression><![CDATA[$R{detail.endereco}]]></textFieldExpression> </textField> <textField isStretchWithOverflow="true"> - <reportElement uuid="16db37b0-e079-4427-88f8-9b429db26ce3" stretchType="RelativeToBandHeight" x="534" y="0" width="46" height="20"/> + <reportElement uuid="16db37b0-e079-4427-88f8-9b429db26ce3" stretchType="RelativeToBandHeight" x="495" y="0" width="46" height="20"/> <box> <topPen lineWidth="0.5"/> <leftPen lineWidth="0.5"/> @@ -286,12 +287,24 @@ </textElement> <textFieldExpression><![CDATA[$R{detail.rg}]]></textFieldExpression> </textField> + <textField isStretchWithOverflow="true"> + <reportElement uuid="be434e4c-9dbc-435b-8177-f81919d62cd3" stretchType="RelativeToBandHeight" x="541" y="0" width="37" height="20"/> + <box> + <topPen lineWidth="0.5"/> + <leftPen lineWidth="0.5"/> + <bottomPen lineWidth="0.5"/> + </box> + <textElement textAlignment="Center" verticalAlignment="Middle" markup="styled"> + <font fontName="SansSerif" size="8"/> + </textElement> + <textFieldExpression><![CDATA[$R{detail.ufOrgaoEmissor}]]></textFieldExpression> + </textField> </band> </columnHeader> <detail> <band height="20" splitType="Prevent"> <textField isStretchWithOverflow="true" isBlankWhenNull="true"> - <reportElement uuid="e91ddf3d-5ee2-42d3-b8d4-01c92a2f462a" stretchType="RelativeToTallestObject" x="127" y="0" width="103" height="20"/> + <reportElement uuid="e91ddf3d-5ee2-42d3-b8d4-01c92a2f462a" stretchType="RelativeToTallestObject" x="127" y="0" width="82" height="20"/> <box> <topPen lineWidth="0.0"/> <leftPen lineWidth="0.5"/> @@ -303,7 +316,7 @@ <textFieldExpression><![CDATA[$F{descOrigem}]]></textFieldExpression> </textField> <textField isStretchWithOverflow="true" isBlankWhenNull="true"> - <reportElement uuid="d9ec1d06-efc7-4a65-96a2-e88e89f4ca91" stretchType="RelativeToTallestObject" x="230" y="0" width="100" height="20"/> + <reportElement uuid="d9ec1d06-efc7-4a65-96a2-e88e89f4ca91" stretchType="RelativeToTallestObject" x="209" y="0" width="82" height="20"/> <box> <topPen lineWidth="0.0"/> <leftPen lineWidth="0.5"/> @@ -351,7 +364,7 @@ <textFieldExpression><![CDATA[$F{horaViagem}]]></textFieldExpression> </textField> <textField isStretchWithOverflow="true" isBlankWhenNull="true"> - <reportElement uuid="bde0e80b-872a-4b26-b882-83efc01c25b7" stretchType="RelativeToTallestObject" x="363" y="0" width="37" height="20"/> + <reportElement uuid="bde0e80b-872a-4b26-b882-83efc01c25b7" stretchType="RelativeToTallestObject" x="324" y="0" width="37" height="20"/> <box> <topPen lineWidth="0.0"/> <leftPen lineWidth="0.5"/> @@ -363,7 +376,7 @@ <textFieldExpression><![CDATA[$F{linha}]]></textFieldExpression> </textField> <textField isStretchWithOverflow="true" isBlankWhenNull="true"> - <reportElement uuid="7e10a3dc-7e63-49cf-ab5a-87bd2e7aa213" stretchType="RelativeToTallestObject" x="330" y="0" width="33" height="20"/> + <reportElement uuid="7e10a3dc-7e63-49cf-ab5a-87bd2e7aa213" stretchType="RelativeToTallestObject" x="291" y="0" width="33" height="20"/> <box> <topPen lineWidth="0.0"/> <leftPen lineWidth="0.5"/> @@ -375,7 +388,7 @@ <textFieldExpression><![CDATA[$F{poltrona}]]></textFieldExpression> </textField> <textField isStretchWithOverflow="true" isBlankWhenNull="true"> - <reportElement uuid="0803ee7f-f5d1-4cfb-8fe5-a6109922ab26" stretchType="RelativeToTallestObject" x="436" y="0" width="98" height="20"/> + <reportElement uuid="0803ee7f-f5d1-4cfb-8fe5-a6109922ab26" stretchType="RelativeToTallestObject" x="397" y="0" width="98" height="20"/> <box> <topPen lineWidth="0.0"/> <leftPen lineWidth="0.5"/> @@ -387,7 +400,7 @@ <textFieldExpression><![CDATA[$F{nomeIdoso}]]></textFieldExpression> </textField> <textField isStretchWithOverflow="true" isBlankWhenNull="true"> - <reportElement uuid="0aeeb871-0a94-4ce7-97b6-892a7d138ed0" stretchType="RelativeToTallestObject" x="534" y="0" width="46" height="20"/> + <reportElement uuid="0aeeb871-0a94-4ce7-97b6-892a7d138ed0" stretchType="RelativeToTallestObject" x="495" y="0" width="46" height="20"/> <box> <topPen lineWidth="0.0"/> <leftPen lineWidth="0.5"/> @@ -448,7 +461,7 @@ <textFieldExpression><![CDATA[$F{vlrGratuidade}]]></textFieldExpression> </textField> <textField isStretchWithOverflow="true" isBlankWhenNull="true"> - <reportElement uuid="e4dc6a7f-049d-45e1-9c6d-231303fb288c" stretchType="RelativeToTallestObject" x="400" y="0" width="36" height="20"/> + <reportElement uuid="e4dc6a7f-049d-45e1-9c6d-231303fb288c" stretchType="RelativeToTallestObject" x="361" y="0" width="36" height="20"/> <box> <topPen lineWidth="0.0"/> <leftPen lineWidth="0.5"/> @@ -474,6 +487,18 @@ || $F{tel}.equalsIgnoreCase("null")) ? $F{email} : $F{tel}]]></textFieldExpression> </textField> + <textField isStretchWithOverflow="true" isBlankWhenNull="true"> + <reportElement uuid="02c27999-1a75-4530-bb30-75c2fb08e297" stretchType="RelativeToTallestObject" x="541" y="0" width="37" height="20"/> + <box> + <topPen lineWidth="0.0"/> + <leftPen lineWidth="0.5"/> + <bottomPen lineWidth="0.5"/> + </box> + <textElement textAlignment="Center" verticalAlignment="Middle" markup="styled"> + <font fontName="SansSerif" size="7"/> + </textElement> + <textFieldExpression><![CDATA[$F{ufOrgaoDoc}]]></textFieldExpression> + </textField> </band> </detail> <noData> diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/utilitarios/RelatorioGratuidadeARTESPBean.java b/src/java/com/rjconsultores/ventaboletos/relatorios/utilitarios/RelatorioGratuidadeARTESPBean.java index 64cbcf4ab..bcbff4af9 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/utilitarios/RelatorioGratuidadeARTESPBean.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/utilitarios/RelatorioGratuidadeARTESPBean.java @@ -17,6 +17,7 @@ public class RelatorioGratuidadeARTESPBean { private String numBilhete; private String nomeIdoso; private String RG; + private String ufOrgaoDoc; private String CPF; private String endereco; private String tel; @@ -121,6 +122,14 @@ public class RelatorioGratuidadeARTESPBean { RG = rG; } + public String getUfOrgaoDoc() { + return ufOrgaoDoc; + } + + public void setUfOrgaoDoc(String ufOrgaoDoc) { + this.ufOrgaoDoc = ufOrgaoDoc; + } + public String getCPF() { return CPF; }