From de04942a9f4f9266a7ff500ae4642e8280bb5c6d Mon Sep 17 00:00:00 2001 From: "alexandre.lima" Date: Thu, 31 Aug 2017 19:52:02 +0000 Subject: [PATCH] Fixes Bug #0009446 git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@73390 d1611594-4594-4d17-8e1d-87c2c4800839 --- .../relatorios/impl/RelatorioGratuidade.java | 2 +- .../templates/RelatorioGratuidade.jasper | Bin 57038 -> 57128 bytes .../templates/RelatorioGratuidade.jrxml | 162 ++++++++++++------ .../RelatorioGratuidadeController.java | 8 +- 4 files changed, 108 insertions(+), 64 deletions(-) diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioGratuidade.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioGratuidade.java index 9aa456219..dd03c0a06 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioGratuidade.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioGratuidade.java @@ -200,7 +200,7 @@ public class RelatorioGratuidade extends Relatorio { sql.append(" AND des.parada_id = :destino_id "); } if(!categoria.isEmpty()){ - sql.append(" AND c.categoria_id in(:categoria_id) "); + sql.append(" AND c.categoria_id = :categoria_id "); } if(orgaoConcedenteId != null){ sql.append(" AND r.orgaoconcedente_id = :orgao_concedente_id "); diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioGratuidade.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioGratuidade.jasper index 6592be383eab7cd652e9bf7a446cdd531afab3fd..d89865aedd14c00d90586c84e44b819cdb9f7a56 100644 GIT binary patch delta 3232 zcmZ{mS!@$m6ozLev7OD31w(L1fJ7`sO|VS@aVfN632Q?3kj-RlPs{`_6MO6gN}P=) zNuQ!CREermm7=ynNPtFEt;!}8 zJu`R4KiRy(2L<9mOqnqc@-eXOj2ATP%g6QYqQ9~M;yHk7W2Nuxpe z^^L5;K)J{k05^ ziGh$GGK&#efYlPuLO%90QTvl3eL#@7Putl-oNSB;zG&iJz{V^?jme10;bfBwkz|qt zFYik<3TB#-%!Pf)rPPu#FGnM3vX__nhUD|LN@+TB)xfra{HzViy5@YA9R~K6fsV6q zI~)$D$r2H_#xjjrzG~}4?dU22Z?#jFj}QwEmvmT&tHYu- zQdo$AS!hlg%O%XRvZD*%8Y`IXu#&!9K`c1T>#z`4hed0oun+^Y(3~`udCW4>*-csg z?4&H{4bS0lU5ACZIxJcvg@qWHh32HOpie<1czV1Y-=k{M6Z8`2aJa3*L0laUt&ze( z49r1u(m2rfp%OT|kJFx9>!v+aY-3hed0oun+^Y(3~`uMaXiFa!7rcqlkNnIB?-m}3Huzm0)f*`R#tU#?0&1jw|k zV4{*OM5JJ-5M@nB_z_i}NEp=KVg>&Wk&K;TlUk=QLZpu)IjVGDCenYhL6yp4MCy$t zYK;#Q>F#hsdOkv=b*GK$#JV#?8apF$@N4FpC->Xtn7nyoEBe8O+5?!R1jK zR3DD+%0?=>X?{=;->Atc1HJJonDb%01IFj^_hGCU+XLgkSe*ga0!vwC;NG|q{4}-= z>Y3w*U~C+3gz=N{P8eT}J7L^9f$F#>+HougixV|)ls8!qBXS`3-&G3&2R8O zm`3xznLf4|q3u0(w7sE`tcGG2`T(nZ41+FufNf?IoN|0-%W?|N&>e%h8K(h#tz}T4 ztN<@&D%f^ln%&L1mHOF{V)j>XZ+)d9mH8CuhyRlKZ g^4ah26sEZ{=x-_mWAoYO!|)HSXKyGViGCscKU~FS)&Kwi delta 3280 zcmZ{meM}Q~7{~99mlg^lR1}J+^KHb9u7yHi^9597IDtY7D2Q;jM>!~MX|Dx!7OE&O zE;H`uUK10I$u?(3oR=kL#BFBDqDwYo7H5J>wiy32S!S|j*&loPyTU#9(VGws@kg_-(5G|1S1Rks>g^cnK^g$HxNn4?&(+wfHpu+-(qhOJjQ zu(qxg+}}QGxHif}Ssdm;+YVzUS%Z6Z@yoVXj1@!;gkUn$&oJLO1Mn}t^BP)V?=ZST z`aFo4%fX*JZWwN&B@PR?0a@b)^b$27ml_SIk3RG0Wu-21PgD-W(eBnw{c^fbWGx>A8@?C5ZulMDR(fCaaK{;m#f`Uu*qnj3eyqCI@d)F1=h5>)j<>Dp50~3^n&?F7X z)&TF}-AY5~k%q2_5Dta;pr|--lB6NV4Ev;|H?a~mG$2o0@U){G>~VN7f(hJqm_X0_8@sq!#Dc@L1`BaDSky)m3o$SY%}HUI#w=eryC6&b zff7*OQH)qRxpxo?4(Bykh^xV(Hj-Gd0q$)znrP|NxtxbAr|C@I>ZCKdj5u((q`^U4 z4Gy)D#6b)^6PlAUlS_CeQ(fJZ?5$)8-cOy&>5Qe*C7lo*Y+96Pmu}q^%Ln*e-4t+alFIh z<0xkz&Qh|>E)yueP$o;R_{I<1MEcd8uVm#6kXkJRxr!9=5b1{JZH__=4qYWzvU&Jb zCGVWKl;a*l^bPWl-aJM9XN2tD;foja_=$AIU!Y|D6d+R3XqPRY6$BGRK! zwj$}mL~06WD3TZ<($z@3*4;58<&Vdusv|@iJCdnveD5fc7LSS?{D$S7SPuq{SHr6d z$8EYr_y{GY4FA*i$8jrEH%GT+Ar-wm!@wKeoRsr<)I!%U;XV2Z8{D&Pq7KIB#7-D* zP1I-Ls^F=94cIhU3$?zPHuuN>~+caCX73@7_T2pDRs;sW9u)EjcOFm)7jU9K8lkJUG4Na_Kcfc@c(GBKipNCDa&u+=1 zx5m&pfhV)I>99cn+`70DY@b`tIsreoo#o|=bK^xN5BD(z=)akeAno#x1Vpc}8?InY z_93Xed~Q`mrNvTRQDv*L_0`r`Dr;(V49hYvg3*lC;P>k~`QOWrUoJ>Vl0d(G4Ji0! F<^R8eb&~)9 diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioGratuidade.jrxml b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioGratuidade.jrxml index c769dec69..f5860768e 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioGratuidade.jrxml +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioGratuidade.jrxml @@ -1,8 +1,8 @@ - - - + + + @@ -69,79 +69,107 @@ - + + + - + + + - + + + - + + + - + + + - + + + - + + + - + - + + + - + + + - + + + - + + + - + + + - + + + - + + + @@ -155,58 +183,78 @@ - + - + + + - + + + - + + + - + + + - + + + - + + + - + + + - + + + - + + + - + + + @@ -277,182 +325,182 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioGratuidadeController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioGratuidadeController.java index 7d41a95a0..e4b7fdec0 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioGratuidadeController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioGratuidadeController.java @@ -144,12 +144,8 @@ public class RelatorioGratuidadeController extends MyGenericForwardComposer { if(cmbDestino.getSelectedIndex() != -1){ parametros.put("destino", ((Parada) cmbDestino.getSelectedItem().getValue()).getParadaId()); } - if(listSelectedTipoGratuidade.size() > 0){ - String categoriaId = ""; - for (Categoria categoria : listSelectedTipoGratuidade) { - categoriaId = categoria.getCategoriaId() + ","; - } - parametros.put("categoria", categoriaId.substring(0, categoriaId.length()-1)); + if(cmbTipoGratuidade.getSelectedIndex() != -1){ + parametros.put("categoria", ((Categoria) cmbTipoGratuidade.getSelectedItem().getValue()).getCategoriaId()); } if (cmbOrgaoConcedente.getSelectedItem() != null) { OrgaoConcedente orgaoConcedente = (OrgaoConcedente) cmbOrgaoConcedente.getSelectedItem().getValue();