From ee4456aaf8e311aa0ce65c8b85d2b4b2227eceb7 Mon Sep 17 00:00:00 2001 From: edgar Date: Tue, 9 Aug 2016 14:00:40 +0000 Subject: [PATCH] fixes bug #7716 git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@58893 d1611594-4594-4d17-8e1d-87c2c4800839 --- .../relatorios/impl/RelatorioTabelaPreco.java | 4 +- .../templates/RelatorioTabelaPreco.jasper | Bin 48786 -> 43267 bytes .../templates/RelatorioTabelaPreco.jrxml | 318 +++++------------- .../RelatorioTabelaPrecoController.java | 20 +- 4 files changed, 105 insertions(+), 237 deletions(-) diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioTabelaPreco.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioTabelaPreco.java index 17ff1ae91..8923353a6 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioTabelaPreco.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioTabelaPreco.java @@ -13,7 +13,7 @@ public class RelatorioTabelaPreco extends Relatorio { public RelatorioTabelaPreco(final Map parametros, Connection conexao) throws Exception { super(parametros, conexao); - + this.setCustomDataSource(new ArrayDataSource(this) { public void initDados() throws Exception { @@ -102,7 +102,7 @@ public class RelatorioTabelaPreco extends Relatorio { sql.append(" AND r.ORGAOCONCEDENTE_ID = " + parametros.get("ORGAO_CONCEDENTE_ID")); } - sql.append( "ORDER BY r.RUTA_ID, vt.FECINICIOVIGENCIA "); + sql.append( " ORDER BY r.RUTA_ID, vt.FECINICIOVIGENCIA "); return sql.toString(); } diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioTabelaPreco.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioTabelaPreco.jasper index e8189e69594ae3bf885496abcf8c392394aa7ceb..e05888f695357c23cfa9e05c49b94f93e20a6506 100644 GIT binary patch literal 43267 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 literal 48786 zcmeHw2Y6h?wg1e$ccqoQmMg9lxe#0>cZv^l5Ar;SgfU$y;#zU)ykGlHJB39 zOgDrMrUVio5JTt=?LkNk2?>EDkU$8KP#--c&i{92=H5GZ_jG?%X+3 z&pC7EoN0T*UIa4ncgXJy zW>&F&&9U~*Xj`N-oCqh_u&U$28^VRrSYbmX9u2oeH;31>MdntqK`L5JxINO)-P#)M zNwC2(a$C4#ZDB(q9_?6*i2YT>cu8BhtLu1nGBbMOY-+l?tqFIbg7w9CC0B4#B^z1S zP`0$RwyB}4zOtyQX<1o)LuGAE)6&Y)N)}oZOC)0L)!{fASxIea>u&ETiFJ1*Dyb&) z)zBGkM%5hX@@Pw9-AXnvy0#-0kJN>cGMtFUI##kF(XR5gSU6E4(v`elzU60HQe2n zXh>{oizL{=y(ARTkSwbuk_boJRCW5xuLirJhxC?C@VTd70W~CND$+A@YJt89PLnzO|agoZz+@T4H-u)&Q4VRZ-J>FRISr za8c4Kmeob11y_8hH?FXWo82Y5r>Mp%mXnCIceaHSlt*E2c}RKFs8WDXfduth)uJKZ zj-^^PyZ2Tt_jE|nvYt-H9&d!?9g2rb5p0f?Zy9JbFlH{I5Q;LCb)Fn&)6>aKqE$h1 z7qoL6%oyZu9*Oe;V!i^Zg%0dYK>Rn>cVgt2oURm2I+Li7S^ z8#>#fiK4c)*v3dp6&oTLg>Y2X(;1I+bqR4ZDJ@zT)w^*)rv9Dr7zVjSG}2WaMoXsl zlDJNfj`TTQR3nm>2{uq0#)>y3Xtc|7z>4P6(&jHZjc6m~D9IgXGc&|$SzDwXgTX?` zYw!sD5q1p-jplXHww5?xb{&O8sfu<9Q5ezECD@d-H3a&!*mHY`>O%x?P?iNn@pyO> z<=eC6R|j12bogqM@k(ZOMK?!?Z&}Vp3vMnFP0O%Rjgg*2c{I|d@ymYc`KAAwSZqCp z+4WVC4Ux8DmKWIofhC5>#%Oz_mY%cV9-NM$p>(W?k>*Bq7y&(7 zenGc{T5k8}@Ww=;2tliqE?cZ88YJ~w873l9Zr_3YlYqK#OAB;cFQO_t5|Oo$II;}3 zLXRV^S9lQL4d~SLeF!)hog%s!al&myZP15F45{jl@Bt|fpOaS72w7O+%~!E_7U&ym zYoQXxqjJ%%N)#MzR^R=jU3D$3W$kMsEiDl{(g4w;qw6D$>mVN2u2XSC6bvlf`>+5von6-4_`gwVM?2pvFLcq%&kQLsWLWe413Q$EEpm^r=aVO26B@ZFEnD0_pl z0oey?K?;8vC}5PO%E!hXNyhF@$`$+${uYE+b%o6k53h}fJJ%)H#I)2|R8PHHM5X$6 z0^uFaG2$VWGX<4vQa7pN!Ll<7p9z*8sWA668_!Nf0#a9asD%AdBn+~MUZlA`vPrSB)gEgRk^tQ>hy04BlY6IW zHDW7f>xaGtu_(k1Wt?5bMrc7KU7aCO6+B2snkqB{W4ca5wJO|CQ>H?ox9sOA(Lx_7 zSqB|IBIaAhB&)}iVmR~xr894Ghrvwr0i`-?sX&W?8Y8F{W+2v-az@;v8fbNQgNN+l zP^h;{F|z{&Rar}e8CS;A<#OO+Q$E64KyW~&j7(fSU{JGTXS?Q#h zXtmEk@6+f_ zp1KIBlTf^RN=OMpQIJl(8B$2+#HKOSPjw(|A|kZUvXsHv>~tXh!zEeGZtB!gEQ`i9 zl}C?2W~P=Vs$MK6Op)BhD9saOIzKCs=BDMYqC|9titI(OdfU<{*nVI6it5+SKUK#V2^`=nt?<^$a8zTrj9g3* zw332Fyiy7CLK;YrH^R2?gd}VKlaN+$rCflp?XD_JBSV3ZO1Q%yz0J#Nio27Bq>oUz zJ=F+x$?}R?VF43;QQ7_~tT;mYk_rqZ!fP5JO9aQOu%HSP*c=V%f0q5*60J*}IfMBw8hY^_Fz?nFG+rROH=ny>PM zB8_D92RiUykS8NLTs3Ulmk;fYY<&5KvEM!W^hLAnrrUI&3bi@K_KyCOD1mTJ@Ik+X z`k-G2c+jr{{L!ysppK$;4*E}UYOOrIqJO#%`uodn&>3mLN^;DTr6?}n7ysuH{?R?9 z6@Y2L0-@dTox@Kbc)`qWg9XZ2R%^Jeb6wch+N+q+4EZx!Dkd~@DC}N2e@K%>k-1p> zYK^a5BLqu=8LP@6w_3#)HSIhhS=hhvhiX#DKynTc)jWqP^lv<(1(5C&(+LhCf^8$2 zQqrF$)cZBo7u7V>71cxUmqjIa@4NpJKJ<&{$G#Rgz4O3}au?2Z*ebzt8p0i2wEdu! zs<%MYv<^7yOI-_^H3S>L2ezaaw6BPMxBYUq(r#Bhp`nX7$dSms2X?Z1dqw z3H9Mk9pK?j9pKNKDh5`ttd3Ym#Np74OirP{%E6vASV;vB9kLoKYZg|O2^4G-lufX# zlFsQfX3wzcoL2J}bk=9ze9EwDYHP|UH$q-o={3Wr`>0VQ5eB)#qE0F&P%Hs%+(#dx z$pA4SpfPU-d`(rn(4QfHy8I7|e)#Op?O*;aet5;7i?e%S$YPhlTwfnp?Z=c#I6w4Z zH3{`$H67q#H67s3YAQwwt5HR65HowP)oc%WlcmW$QwFSBzhLc@vtrjbH+@?3fkQlzT8R+RI&yj! z1dmf8!rARZ9SQZJjt=lpM+f**N5!yf=L}N2omwjo)hsO?X8F)zupFck;hr!SSi7K;Dv#H+*>Z<;O47CZ?#)eJ8@ND4B4c_aTCW`Vc_} zc!;0_{E47qq!8hG53=ylD-mY<5J8E$uE^SM>_*W4_JRJ@P}B-C?gKwL;+4ZYzdHF3 zXJp;6@TJ0Lwn}e2K-3S7hU;7YN&AD z_aT9V`j9{ecu1fF{7Il$kKK9k^39}@IaB*1c>iw4Tso$iPIPczSHr-y}B;@NIP z6rw*(1vt4_g=)Ip{{sU13d)Ezx<`XX=Y^Y<#rLKqY0O8VKz1h+-angNXjjUUg z_pj^j9=zZpmo;Vl^pc?yRp2>}lbyVzQ;d%!YG;bY3Wi`d?6(9xE zNA?NR^L#L!6-%DC%n;FD<1ihff3j`V9XDMub=Mu2o?mnS4;MZ3H4t4*h!)ObA4E&2 z52AH|2hlpfgJ=avLG=9l9S{^6qh`UU%Q~@iWeB-f&Ds z$=5*lDnhq#R`{S>LVeJ!13c)~0UmTKKnl8r>ES_nItg-=54y8b%)AT`ooeu^4LVotNHyrvq4=VIj+z#(YrG*ocH*AVJ!MxXqd0@na08)OI0+vVOQ;Wu zb$|!OI>3Ws1xP`0qE9GZ;Gj5HXfJC?YnEz<{N~sjQP2|W#<9R=dH4a61`hGX6R5dLqRyUmsBi^_G|RTic}}FU zwzsTg*ce@n-ABc2_(p8KtdDfXy5r4}>L^aebgXT};w!D=&|wN#p}ii95~nV(>O8PD z+J+qf?!qp$XBcu?O9xFd$;m$G;2tkqMQ0V=vjmfRvxsR&g*bSC`go7*P-TYWxD{q1 z8DZ(pSiygpnc zwmC^2=M1wHl9kfTQb<-Z=DqfG&7}YCw5KWZFrP9d-Rht=pCWQ_`#}IZR$wCvRAW;y zAqwPk`D-6s($@_X=(EbwM^)1vZo{@3{bZP1Q=E*ps2z$=^VHs1oHwImQWQEmxw77K zpE#C=O<(xK?pAld7j}uFOAC3=uLsDsm`PCan|h0_31Ss_sK^>eQr8s}N7t4{nxpNQ zS`)d6?3Ep(W#3B*O~z(cgi_!$FF_lywM1!f6u>5`b>Yn7W@9S~L_~(MhqT~e@iOdR z>1d9ID?6fa+q81DExM5Ca&cBrZIGU>9OuU~N|iF+WrpC~Xp3D%t!~<4xZ3EeQ9as% zrC|@se4^7lWv>!I4gm{pY}#D)ub#iz62Rz#1Q0p6{c2#kkr0ReTE(e*d$aaRHj)k| zh^_AO^muJYS-4poxnIc!5e(GYf2#Vk+jLtRPW+&y+w;P}5hf2x8g=1LY?ABl7} z#&Cpi9UZJ6-X86!5NA~zV+~qF^zUZ6Nx&A(IH;ah^e(EmV?v0h9_Jh4ZJLti85|~- z$F6OZsJ*KF#3=4Lkv&)oQuEj(r-G2V0-_zi#}-5_$Q#*}#*R89$w&KD3Nw`ZHYQxc zr&WP)vIM7cn!9mq8^Zz)c1Amz>8|M!=fEHsS|D!^-0qDykl&xz@6SAQmZ63RckWXJuSK(AwadHuY)vW z8{fwqFw1DGOA@gZL+a~2fs)##HH{=8*&2X@jvb?R%E4|K(Gl60?~cVvZcdm!5#ugu z(ffYZ6axCxLv4p~Dw30VMW&%536>l0PK298Ye*^hb4IIS9%A^^DzLD=c4-|S8a88(Fe~36@t8Y1x@@g?|5v#in+_T|Ma=puhe2EqP=KDWyzgC>1QJ)s;Fe5%M{0%A@`gMQ@{W`!O{VGNZ`VY6!ZoiY!pRz-Kpbz@@ zx$Q(WJ6}mj7yDS67JCmf!~V@5{(a}3dtV=W$I_>^9sS1Q=r_gwBEr6KDtxdnp+4Bx z0Uqq@0DtVO7%AAVu(58xd&T}BAMAg_y@#0*;j)t+`{^|wKeq6XPi}7i&HAEk-;@X| zhzP=2?n49#^&x@|@DM=<_!B|JNFl;<8~OITS0W7dAwr+`9#S8m!#WwFzxl<+{kzuR z|Kc_ILtc5g=9O=Xe!Azw5KgNP`X$r{{W`#dejVVCeib7H{jE0I?RT%}AF^-sr>u3W z;U-lC*(-sWq5t9Ce}3@Ee;x8g{q#Mb&HQB1SAOX4%lNyI&@UV;6i|abs;z|jpkD`g z(60mh(XV2ppugKjyZ!DJ{X>1w|FyP$q6dg$Qkjw9p;zlmSl#M3J0H2@qvOX`{=ts~ zeHnw#BoYW`s}Bhz)Q1E*z(WEZ;7N^}7`I{Ku@Q8=8gGeZxi+xBap*|$k0Ui?S0Dlsy7??!xo+cuS zNfYB@LBy|XVhr0iVUu?LQHjnG4`&{6ys)ZKJDTDk!NOl98i2^^PlUa0&kRw7w}t$n z>51Ir!h4y~q0}EJ0ZZxoWu9J6#N=&ID+A7CjBzVv`Z+mYO3G2j!;>?{youk+f-t%G zzePgs%zS`YLA#&?8(JU194HKhSR`E>fDvqu`G1nq{ojPW2l=v z4#Ko;UrxY_^;$^}TDr~=6X@l!I2OvZR&I^CLh&JKmL=Cy{!4=bzq4UcX?qh zQJePkT`%tIBqImMVS=Q-tgg1c5p={gBu6(&3dq&Aw8tFf?Vxnt9w(ngD&t|9<9;ef z9C0kFF2mg>4NcWWb$Z7A#Y~&H-vvv7p2YnZ6*bhA)#Iues+FE7<13s!`3-WLS5sEf zh})6%JmocyUB|cKh-pWMyvo*-e4t8RU39eMbT_rj>2|{htH`BAjYUljwM*+u%G~H! zAxXDBATRQ55bO88HE1ZQudHjVD)ZnZ?UKWy`l2SvgIaHa3+Pl{D7Y%Pnzg?J(`R2GKb5T=&LePt}H~HkMQs zH8eC;)fScFiXN?Y`?+()Vp~O3j4u22WHCx*v9!LbsiKH5RPR?yIq6QUfrxZbQn+pp$Q6r|(RiYpZgfvV$+F%>VvyQ!tA9DON;uJf>2ps>p^|`GIBv@uuxG`rJTZ7-9~GY zzIyJ|Or`2WTk4lW9`>n_tg6bIilRQWW#F>Pg=IA*l_;mC5-+ueBE^};fzDn9yE%DI z!g7!|<7EAuWPNJaz}otSMYS~6mXwv!ym*=C4BZYQN>L6e2Kk!qE_-EYwhx!$-QlZ6KU;xbG(=4V>1=%0zHOI7(wrO z7r!*>=O=#h{Fuis`rwRD4N|Af{NQ7j<0SdmXbfFT=Nv*_o$Tm{f$9wRAX6hRXVq`&T%| zZP;co&tDeGACRFPECp#cmdXzAIf84|EUl`d%pVZl)m_x*K8yOJ?1Qc5SS%!epR#k- z9?jF`+!OLjx%%OOuE?LdC!ceAY{)a=Ki1WhI+Hq5M$n>uKamkl=NLIMBPBq5mi5iE z5luR0$Q<;!PX(0#eOccF&}VHt0DIO(aEvS{bv;=0c=HUqqRv~NDG_nBv#v$Stbw)P z-1e@u1@gy0oIJ?m%*KoovoRTMzp3^9AczmGbE=^JHRMkYDp}+3m_BhRvLtp3Id_v;Rb}Okg6$}CZMTA8$bD^85ZrMSv7vCT z@?k>>^O&PB;Gv2R@K8ko&@zDsdq0ACw?dWsN+%XZCgUDrVQ@1h7BSzkE>=Lh zm~nwGW~a2jec&CnGk#8Z7w~VRQ~mga$KJZL!nmz}es2jQyT!V~{V6ne2sqrtwQeW8wVDhsF}>Lt`D_p|K9|&{zS|(D+vZ^hiKZe<~!bksG0x~8t6skHR~blQ3V zI&E#hzG-Vo4f5-D`vV+`VtNBar*1#Y?Wy=>K}`4HNMc4AOQUxE}{)Yl60!n`3o-HwtLBexh=-V%h&v&#&8HLQmfnDkVkqgO4Q%Jiq{&6 z_|h4k+B+50hk`Ph1b8T@13VN|03b(Hz*eWM;Syc@-a<`yOuOClK!MLpW-djqfBn#lr;NDd57jeW z(&%N0qWt>NB%*?FCiqZ6LVc*913XmF0UjzS04n9B!UVmV!mkhl43Kd~L~!qQI>^Cz zmc%&NUz_HaVLO%t^;GuyI@X$a3 z?7BG8u8ykb`P2FtCWE~FY>b0%rDvd@*=tsMCcW@{mB_X?p1;@V{@}>j?8T|p=>rdZ za^awFgXfzF-@-Y@2j3FvgKr(+!M6_Z;9CKJ6oCr|-^WNaeFL5!>(IdEd9|OKjCcK9 za35Kpl`GcY2Yp0KNZlOgR6!{x5UnAyJJnjSD^T_ILXn&Xy`20pQVL5!Ni3!=_`m7F zcPCWW#8xbL;)Jdb&Ro2~CAs9p^t&aAtE?W!>F}Yjg!)ie2Y4u~13VN~fD{UM=p8}$ zwH}o+a*cOT>Gr79MO`;bjBBpxF58i>@^@4PLB~fxr{3szuv7TAOvmfDj{EW4o&A13 zcvVeP&`?5sXs81`G}Hke8Y%#)5sb zI>5sb3XsAP-**Y9d{|C@{5oPAOH3hqP<{=*NQdaH15Ws+C|BxiiXgrF)j`)i+47s;^=^3gAaIy5!Usv7;J`?)dV{Ph-JZ?6kL* z*8StHs=v7?q)1ZbPS3fbP{*)+l5i>pUt#gR!n&lKd! zNoNhY)F9oWO_6YulCg%_2(Lw}<)(zGO(XZ7HJe6@d!f}0ihb%Ig4_S18O%|;n!jqtqqY=vKVI6;p zxxuZeHyBSz#tk->+ZWvEdB{R+8aRUien?VErq%v5pe%?RR3Etg1>X4TKf50?itc7t z{I;e+$FEzOXpi4G{wCp8IB&@McxK}yR08yMbD82z3Gj#!J%tCi3V&**%MpP5dCq7h@P#>!401wr4fQM=dfcko=_K9r4H?WZk97?)2 z(r|gvd@Q~;+#HT!-+Oa}e!5ToKJLEe;+%~Ur`a1LdjAnInF^6vlQM|=$%ZuJ2fw=TgMB49 zn4uzooO~y4sA)lD+~|@D8P<-A1}Uo)D1OFS(8gRae}O0`B=!^zB!3SP%@=?zcgCvX zJ3b!%MOLu!PnZ=ZEYAG#vwI&Pqojae&)G!3Gc8TiXU&;0d)ACY4?Xm-Ll0}3gB^;8 z9+pi%_DkCg3%gnij|+EoM&fc4XIEiF>_RHUorZ1r?N;^cf3bKrGdUaX+)3EvIa$G3 z`fGqxX4q-n<{qEnY?Paw+KT3E-skMV6rg9DI%k922x_vBvxD3)m819E2xmjx819Z` zPgUH_xN`F^7e7NSZ&y?&N$m4296yy~U%cpmv`zk;jZcC5?BM5Y|CDIju@4U}{PvK0 zs-L{G*8@~YaSovP0kH>D?%4OBSZ%xZAj7*Ko#U6X9b~vjEcLLBs(?Ht!r4GKh1{g= zhYD>MzNZZBh=8YBPT67;wqFyS<1d_zc59&OhW*s)aF3^c@^FD4i+K-?c(A56-h22Y znLyZj?Mb7y-gB0pQnjQ*GMtTUrOQg2NC??eRO)s;&I;1rp{8|7dHEz~gJov=_0_wIazsj{DM0jfWu7KTg%xH zC*0l5s>jy%kLt1A8>)aLClC7+qdY{$S=Kzdk?bhW%n1{hab}goS|TAfj~$uIEH*#H z0xT=i1m}c#UU1wzUmO`FMYKkmM48nLTrHa zHH6qe>026NgQRbH2(u-kj1?g^MEX{R*ih*^CdBrWzNQcxCVk-$8!mm#AvQw#(2kMP zw>HE^NnbR?MoZuN5Zhn++C%IB>5GMMJVBIue25(+eO)1zFMZu1Hb(k3hS*r?+Z1Bs zr0;|f8!vq)g)ryy9m3ivA$ExLZ3(dn(sz1@O_aVfLTr-sofTq}rSE$oHbwf*39+ft zcV37UNZ$n^Rw#WJhS)UeyEw$AOW&m-HbeR@53!ljcSVTJVza3(-w&}l(sy-;9V&g- zhS*`!cYTN*E`2wK*b&mVGsNaf-z}UCz-5){{ze>nZHsW0*WBHeh_&OWQVZlpg0pE8 z>;!?1MSD7uw=7GAlp>Gb`+H$dkmsQg?coUAp03-_Bv*eJ%RqNqIq?a zAbSdkag~uE`!AH^3}WgCQjk3haye2(9Ip+s=O8TXFir0WvR`7@Qve@@BgmcysT5q( zG=l6`XpEnV5o9l-QprPCkp0$0iKA2m+3(y?N1F(;SAY(sMg-X(&>FA)5M-}HqPy)b z4YEIhA?~EA5M+OG8=>h4LH1YVqbUbL_BIN0G8S4vkp0cAqoWQ4*}E8u zZG<{{K#;wUQl$bAWFNYO^p5;N_TOls8uEke6VN6ZVHoR!>@&ntgM5&Efzd=2m^8Wv z**}njJ|?1z(#5$!_Rq|ecVb`B*|OPQ42Sx_9^}}Js9g{os*Z+O}<93h_ zqc~#F4)PHor8Zm#`6w=~M(xdRp{7Hih+Dz4`TpP|&qy8Q2Ld4up)p1Wc|Mxyj?O_o z7BTd3ImpK&hC3n$`FFrp-my5yCqSA-HsHQ~Y!L;cOsMn`L&&DAr#XT%{;>|oOmS|! zP>8O^b@A9n63y9sDv&9}odBrAli9ow<2y2iRGr7C=kjTM1`31>6!!t3^G@(7FT`i@ z*}3fBd=7Zt%~S5b$mWNkq4v*Kl71HCM?kLPuy>MNmGM1tRRx9kJPu{U;72)G*#ukw z0%|`-7v#n0w03Fk@1z8Isgu;^m2xM<=9mi9U!`^Q(I8(0>dH`uf2*7zhdFCNEO+=Q z1$nZ0T`qf+km9pdJIEVy`4ToC-7^_u#oeu~k$5&=hT6EB$K;;TAU_(cO!SY`wkF}v zXIygdx00{Q<%jd{63b}gmW^^j?$x<`Id4M8%@1-Y(OK9|9_eU-DDX>>l8LPK+z@Z( zEtF9tmmffF_oUuu6}8msD0LLHaogS!3G(&eLwiq8G9Nn4Z08-6ItHw|sr7AlL4LeL zI!7R&kMJXcyc_aDtX2g1M&f+rV&+c;GB!IrCM;ZVf|`d0EYD9V{o$R*RI%zXv<*+78c8oDpO(7i7{n{Pu^wcqp* zDtl>&pUcn7<>&D8J^iy({PssS-%dA*>14F!FUWhl03-N|&A>J@7#2aRXc*Cd=ZJ5WIe8XH2Zx{>W4O2n9VJL_<%mnd~i6AZHOdRpiu=Q%6ocIgR8jBj;#xR+95wa#oXbEIDh)X(6YT zoOR?JM@}0#9prS96DKD@&IWRN$k|NJiR7G2&Z*>_M$T4p&Lrn-a<-9kE;;9uvz?ra z$hm}^%gEV5&Xwd`Mb0(kTu06ge>%SAzDR%>MgMM&V;3R4m!|wkm*w7b|q}PYhl&h1bgl_SaLr??)QLn_k(y3 zgLpq<^V!oV?KxJ&USP%Sx2%Nyo|Upcq4YPgPvviHA^U(;uuoVe`x3R;%NBE!Rq>$M zzwiTgyJP{;WvS~9oHY49cITui_pu*OntC7miHixs0b@s_W3RyM0PZ7VtH3s}=VT7X z;|z!9(c=pzO&)yTPuar;dyGAbf8wUegLivEN)ht7C!`!9PkKTs5c0GqWD!E1@q|<% z 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 ZxcQ#RNu>W>Waq5XBJ6=}R_Bf4{|`V&#+Lv9 diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioTabelaPreco.jrxml b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioTabelaPreco.jrxml index bd7e6d72d..d5276ba0f 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioTabelaPreco.jrxml +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioTabelaPreco.jrxml @@ -1,8 +1,8 @@ - - - + + + @@ -37,111 +37,78 @@ - + + + + - + - - - - - + - + - - - - - + - + - - - - - + - + - - - - - + - + - - - - - + - + - - - - - + - + - - - - - + - + - - - - - + - + - - - - - + - + @@ -153,32 +120,32 @@ - <band height="130"> + <band height="69"> <textField pattern="" isBlankWhenNull="false"> - <reportElement uuid="136a5066-d141-4362-af36-0780f0d16542" mode="Transparent" x="0" y="0" width="457" height="35" forecolor="#000000" backcolor="#FFFFFF"/> + <reportElement uuid="136a5066-d141-4362-af36-0780f0d16542" mode="Transparent" x="0" y="0" width="563" height="25" forecolor="#000000" backcolor="#FFFFFF"/> <textElement textAlignment="Left" verticalAlignment="Top" rotation="None" markup="none"> - <font fontName="SansSerif" size="12" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/> + <font fontName="SansSerif" size="14" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/> <paragraph lineSpacing="Single"/> </textElement> <textFieldExpression><![CDATA[$P{NOME_RELATORIO}]]></textFieldExpression> </textField> <textField> - <reportElement uuid="a9d471fb-1e1d-4d9a-9783-bbf988931192" x="615" y="0" width="100" height="25"/> + <reportElement uuid="a9d471fb-1e1d-4d9a-9783-bbf988931192" x="656" y="0" width="65" height="25"/> <textElement textAlignment="Right"> - <font size="9" isBold="true"/> + <font size="8" isBold="true"/> </textElement> <textFieldExpression><![CDATA[$R{cabecalho.dataHora}]]></textFieldExpression> </textField> <textField pattern="dd/MM/yyyy HH:mm" isBlankWhenNull="false"> - <reportElement uuid="0d200750-aabf-4c7e-b27b-c0e7af4802a9" mode="Transparent" x="715" y="0" width="86" height="25" forecolor="#000000" backcolor="#FFFFFF"/> + <reportElement uuid="0d200750-aabf-4c7e-b27b-c0e7af4802a9" mode="Transparent" x="721" y="0" width="80" height="25" forecolor="#000000" backcolor="#FFFFFF"/> <textElement textAlignment="Left" verticalAlignment="Top" rotation="None" markup="none"> - <font fontName="SansSerif" size="9" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/> + <font fontName="SansSerif" size="8" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/> <paragraph lineSpacing="Single"/> </textElement> <textFieldExpression><![CDATA[new java.util.Date()]]></textFieldExpression> </textField> <textField pattern="" isBlankWhenNull="false"> - <reportElement uuid="bae9bec6-8c42-4bee-a070-34b0a7f1aee4" mode="Transparent" x="668" y="26" width="112" height="15" forecolor="#000000" backcolor="#FFFFFF"/> + <reportElement uuid="bae9bec6-8c42-4bee-a070-34b0a7f1aee4" mode="Transparent" x="711" y="27" width="70" height="13" forecolor="#000000" backcolor="#FFFFFF"/> <textElement textAlignment="Right" verticalAlignment="Top" rotation="None" markup="none"> <font fontName="SansSerif" size="9" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/> <paragraph lineSpacing="Single"/> @@ -186,7 +153,7 @@ <textFieldExpression><![CDATA[$R{cabecalho.pagina}+" "+$V{PAGE_NUMBER}+" "+$R{cabecalho.de}]]></textFieldExpression> </textField> <textField evaluationTime="Report" pattern="" isBlankWhenNull="false"> - <reportElement uuid="314e312c-8f24-42de-8354-3c1f7241a985" mode="Transparent" x="781" y="26" width="20" height="15" forecolor="#000000" backcolor="#FFFFFF"/> + <reportElement uuid="314e312c-8f24-42de-8354-3c1f7241a985" mode="Transparent" x="781" y="27" width="20" height="13" forecolor="#000000" backcolor="#FFFFFF"/> <textElement textAlignment="Center" verticalAlignment="Top" rotation="None" markup="none"> <font fontName="SansSerif" size="9" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/> <paragraph lineSpacing="Single"/> @@ -194,270 +161,159 @@ <textFieldExpression><![CDATA[$V{PAGE_NUMBER}]]></textFieldExpression> </textField> <textField pattern="" isBlankWhenNull="false"> - <reportElement uuid="4e030613-9cee-443e-9eaa-b19fa3090976" mode="Transparent" x="701" y="42" width="100" height="15" forecolor="#000000" backcolor="#FFFFFF"/> + <reportElement uuid="4e030613-9cee-443e-9eaa-b19fa3090976" mode="Transparent" x="563" y="0" width="93" height="25" forecolor="#000000" backcolor="#FFFFFF"/> <textElement textAlignment="Right" verticalAlignment="Top" rotation="None" markup="none"> - <font fontName="SansSerif" size="7" isBold="false" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/> + <font fontName="SansSerif" size="8" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/> <paragraph lineSpacing="Single"/> </textElement> <textFieldExpression><![CDATA[$R{cabecalho.impressorPor}+" "+$P{USUARIO}]]></textFieldExpression> </textField> <textField isStretchWithOverflow="true"> - <reportElement uuid="64027797-62dc-4e02-8e40-958ac1511e0a" x="0" y="57" width="102" height="18" isPrintWhenDetailOverflows="true"/> + <reportElement uuid="64027797-62dc-4e02-8e40-958ac1511e0a" x="0" y="27" width="62" height="13" isPrintWhenDetailOverflows="true"/> <box> <bottomPen lineWidth="0.0"/> </box> - <textElement textAlignment="Right" verticalAlignment="Top"> - <font size="10" isBold="true" pdfFontName="Helvetica-Bold"/> + <textElement textAlignment="Justified" verticalAlignment="Top"> + <font size="9" isBold="true" pdfFontName="Helvetica-Bold"/> </textElement> <textFieldExpression><![CDATA[$R{label.empresa} + ":"]]></textFieldExpression> </textField> <textField> - <reportElement uuid="bcd47f18-94dc-4d33-96db-6d89795188d3" x="102" y="57" width="699" height="18"/> - <textElement/> + <reportElement uuid="bcd47f18-94dc-4d33-96db-6d89795188d3" x="62" y="27" width="148" height="13"/> + <textElement> + <font size="9"/> + </textElement> <textFieldExpression><![CDATA[$P{EMPRESA_ID} == null ? "Todas" : ($P{EMPRESA_ID}.toString() + " - " + $P{EMPRESA})]]></textFieldExpression> </textField> <textField isStretchWithOverflow="true"> - <reportElement uuid="049832ef-f634-42f9-95b1-ac2e1fe23b10" x="0" y="112" width="102" height="18" isPrintWhenDetailOverflows="true"/> + <reportElement uuid="049832ef-f634-42f9-95b1-ac2e1fe23b10" x="0" y="40" width="62" height="13" isPrintWhenDetailOverflows="true"/> <box> <bottomPen lineWidth="0.0"/> </box> - <textElement textAlignment="Right" verticalAlignment="Top"> - <font size="10" isBold="true" pdfFontName="Helvetica-Bold"/> + <textElement verticalAlignment="Top"> + <font size="9" isBold="true" pdfFontName="Helvetica-Bold"/> </textElement> <textFieldExpression><![CDATA[$R{label.linha} + ":"]]></textFieldExpression> </textField> <textField isStretchWithOverflow="true"> - <reportElement uuid="df6b8946-988c-479c-8eeb-c8d40c94734b" x="102" y="112" width="586" height="18"/> - <textElement/> + <reportElement uuid="df6b8946-988c-479c-8eeb-c8d40c94734b" x="62" y="40" width="739" height="13"/> + <textElement> + <font size="9"/> + </textElement> <textFieldExpression><![CDATA[$P{LINHAS}]]></textFieldExpression> </textField> <textField isStretchWithOverflow="true"> - <reportElement uuid="2d048310-1ec5-4711-b402-75ef3d3500d4" x="0" y="76" width="102" height="18" isPrintWhenDetailOverflows="true"/> + <reportElement uuid="2d048310-1ec5-4711-b402-75ef3d3500d4" x="210" y="27" width="75" height="13" isPrintWhenDetailOverflows="true"/> <box> <bottomPen lineWidth="0.0"/> </box> <textElement textAlignment="Right" verticalAlignment="Top"> - <font size="10" isBold="true" pdfFontName="Helvetica-Bold"/> + <font size="9" isBold="true" pdfFontName="Helvetica-Bold"/> </textElement> <textFieldExpression><![CDATA[$R{label.dataVigencia} + ":"]]></textFieldExpression> </textField> <textField pattern="dd/MM/yyyy"> - <reportElement uuid="40c47b73-ef86-4b76-a4bb-ec284d4e6f59" x="102" y="76" width="70" height="18"> + <reportElement uuid="40c47b73-ef86-4b76-a4bb-ec284d4e6f59" x="285" y="27" width="70" height="13"> <printWhenExpression><![CDATA[new Boolean($P{VIGENCIA_ID} != null)]]></printWhenExpression> </reportElement> - <textElement textAlignment="Right"/> + <textElement textAlignment="Right"> + <font size="9"/> + </textElement> <textFieldExpression><![CDATA[$P{VIGENCIA_INICIAL}]]></textFieldExpression> </textField> <textField pattern="dd/MM/yyyy"> - <reportElement uuid="12564f32-d986-46a6-a184-23b23ba50bcb" x="190" y="76" width="70" height="18"> + <reportElement uuid="12564f32-d986-46a6-a184-23b23ba50bcb" x="373" y="27" width="70" height="13"> <printWhenExpression><![CDATA[new Boolean($P{VIGENCIA_ID} != null)]]></printWhenExpression> </reportElement> - <textElement/> + <textElement> + <font size="8"/> + </textElement> <textFieldExpression><![CDATA[$P{VIGENCIA_FINAL}]]></textFieldExpression> </textField> <staticText> - <reportElement uuid="bdfc1a2c-9e77-418f-8169-50c67ad7f116" x="172" y="76" width="18" height="18"> + <reportElement uuid="bdfc1a2c-9e77-418f-8169-50c67ad7f116" x="355" y="27" width="18" height="12"> <printWhenExpression><![CDATA[new Boolean($P{VIGENCIA_ID} != null)]]></printWhenExpression> </reportElement> - <textElement textAlignment="Center"/> + <textElement textAlignment="Center"> + <font size="9"/> + </textElement> <text><![CDATA[à]]></text> </staticText> <staticText> - <reportElement uuid="1bba53bd-7d81-491b-b1de-11a0c570c5c7" x="102" y="76" width="158" height="18"> + <reportElement uuid="1bba53bd-7d81-491b-b1de-11a0c570c5c7" x="285" y="27" width="158" height="13"> <printWhenExpression><![CDATA[new Boolean($P{VIGENCIA_ID} == null)]]></printWhenExpression> </reportElement> - <textElement/> + <textElement> + <font size="9"/> + </textElement> <text><![CDATA[Todas]]></text> </staticText> <textField> - <reportElement uuid="82e75550-fae7-4cea-acf9-f9f56f083400" x="688" y="93" width="93" height="18"> - <printWhenExpression><![CDATA[false]]></printWhenExpression> - </reportElement> - <box> - <topPen lineWidth="1.0"/> - <bottomPen lineWidth="0.0"/> - </box> - <textElement textAlignment="Center" verticalAlignment="Top"> - <font size="10"/> + <reportElement uuid="0241b100-99d6-4e53-abd1-0154defc75bc" x="537" y="27" width="174" height="13"/> + <textElement> + <font size="9"/> </textElement> - <textFieldExpression><![CDATA[$R{label.empresa}]]></textFieldExpression> - </textField> - <textField isStretchWithOverflow="true"> - <reportElement uuid="abf746f7-be60-48af-9882-6723c50f4ae1" x="688" y="75" width="93" height="20"> - <printWhenExpression><![CDATA[false]]></printWhenExpression> - </reportElement> - <textElement textAlignment="Center"/> - <textFieldExpression><![CDATA[$F{empresa}]]></textFieldExpression> - </textField> - <textField> - <reportElement uuid="0241b100-99d6-4e53-abd1-0154defc75bc" x="102" y="94" width="586" height="18"/> - <textElement/> <textFieldExpression><![CDATA[$P{ORGAO_CONCEDENTE_ID} == null ? "Todas" : $P{ORGAO_CONCEDENTE}]]></textFieldExpression> </textField> <textField isStretchWithOverflow="true"> - <reportElement uuid="afabe5dc-df90-4120-a42a-af1d3e6df583" x="0" y="94" width="102" height="18" isPrintWhenDetailOverflows="true"/> + <reportElement uuid="afabe5dc-df90-4120-a42a-af1d3e6df583" x="444" y="27" width="93" height="13" isPrintWhenDetailOverflows="true"/> <box> <bottomPen lineWidth="0.0"/> </box> - <textElement textAlignment="Right" verticalAlignment="Top"> - <font size="10" isBold="true" pdfFontName="Helvetica-Bold"/> + <textElement verticalAlignment="Top"> + <font size="9" isBold="true" pdfFontName="Helvetica-Bold"/> </textElement> <textFieldExpression><![CDATA[$R{label.orgacaoConcedente} + ":"]]></textFieldExpression> </textField> </band> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - + - + - + - + - + - + - + - + - + - + - + diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioTabelaPrecoController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioTabelaPrecoController.java index 29e3a0274..cf7270789 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioTabelaPrecoController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioTabelaPrecoController.java @@ -5,7 +5,9 @@ import java.util.Arrays; import java.util.HashMap; import java.util.List; import java.util.Map; + import javax.sql.DataSource; + import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Scope; import org.springframework.stereotype.Controller; @@ -15,6 +17,7 @@ import org.zkoss.zk.ui.Component; import org.zkoss.zk.ui.event.Event; import org.zkoss.zul.Comboitem; import org.zkoss.zul.Paging; + import com.rjconsultores.ventaboletos.entidad.Empresa; import com.rjconsultores.ventaboletos.entidad.OrgaoConcedente; import com.rjconsultores.ventaboletos.entidad.Ruta; @@ -100,14 +103,19 @@ public class RelatorioTabelaPrecoController extends MyGenericForwardComposer { parametros.put("EMPRESA", empresa.getNombempresa()); } + if (cmbOrgaoConcedente.getSelectedItem() != null) { + OrgaoConcedente orgaoConcedente = (OrgaoConcedente) cmbOrgaoConcedente.getSelectedItem().getValue(); + parametros.put("ORGAO_CONCEDENTE_ID", orgaoConcedente.getOrgaoConcedenteId()); + parametros.put("ORGAO_CONCEDENTE", orgaoConcedente.getDescOrgao()); + } + String rutaIds = ""; String rutas = ""; List lsLinhasSelecionadas = convertTypedList(linhaSelList.getData()); if (lsLinhasSelecionadas.isEmpty()) { rutas = "Todas"; - } - else { + } else { for (int i = 0; i < lsLinhasSelecionadas.size(); i++) { Ruta ruta = lsLinhasSelecionadas.get(i); rutas += ruta.getDescruta() + ", "; @@ -163,6 +171,11 @@ public class RelatorioTabelaPrecoController extends MyGenericForwardComposer { Empresa empresa = (Empresa) itemEmpresa.getValue(); rutaBusqueda.addFilterEqual("lsRutaEmpresa.empresa", empresa); } + + if (cmbOrgaoConcedente.getSelectedItem() != null) { + OrgaoConcedente orgaoConcedente = (OrgaoConcedente) cmbOrgaoConcedente.getSelectedItem().getValue(); + rutaBusqueda.addFilterEqual("orgaoConcedente", orgaoConcedente); + } rutaBusqueda.addFilterILike("descruta", "%" + txtLinha.getValue() + "%"); rutaBusqueda.addFilterEqual("activo", Boolean.TRUE); @@ -173,8 +186,7 @@ public class RelatorioTabelaPrecoController extends MyGenericForwardComposer { Messagebox.show(Labels.getLabel("MSG.ningunRegistro"), Labels.getLabel("relatorioTabelaPrecoController.window.title"), Messagebox.OK, Messagebox.INFORMATION); - } - catch (InterruptedException ex) { + } catch (InterruptedException ex) { ex.printStackTrace(); } }