From b41fb43c077ef70a1785233b5388cdc3c2575a93 Mon Sep 17 00:00:00 2001 From: gleimar Date: Mon, 26 Aug 2013 20:31:04 +0000 Subject: [PATCH] - ajuste nos campos para "blank with null" - ajuste no filtro de categoria git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@30029 d1611594-4594-4d17-8e1d-87c2c4800839 --- .../RelatorioPassageirosViajar.jasper | Bin 36264 -> 36258 bytes .../RelatorioPassageirosViajar.jrxml | 22 +++++++------- .../RelatorioPassageirosViajarController.java | 27 +++++++++++------- web/WEB-INF/i3-label_pt_BR.label | 2 +- .../filtroRelatorioPassageirosViajar.zul | 2 +- 5 files changed, 30 insertions(+), 23 deletions(-) diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioPassageirosViajar.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioPassageirosViajar.jasper index e8bac7970b973c7edcec475e79709f01b346c39f..84c561a19271f16cd510c1e01f9a7ba2312fc6c9 100644 GIT binary patch delta 3400 zcmZ`*du&^075_fx(c3yNH+G!ZP3)v?NS8EivZP&_w#m))wS70|Ui;qbWb4-6SzSmR z8pTOnG9*aH3LR2aRC<7d#!HndkOqv(MbNDXrU{j8j8Va~2V&Y^Lt|@EkWfL|B)-S> zt8x6tm-C(TJLmWNUgzc~&pIwY>-fc+-SC5{J+NkZVXb??d1DE!A~w7LYk}rkK8LHm z<^VS{Cn-Wh=w&lQeg*gqc&V+q&Bl-bgBf|q3xHF*p}wbYGflWo-HbBXv*3J%y4Y}& zQSv#Xl_t&O3yHf9~| z+l9$Y}YT(Q>l_t&O3yHf9~|hm7`G->w?AT6nMTTh9Mc zlMQzn6`wOIZdRbOF_g;2tfRWisJi<1aH^c%zgmr5aBI+q-SF{Xu*H?hBB!cNPRNsS zT{c8|6-emM(QR%T+AK}UvSErLtr#Hri}$y35YG?GQdHBYWYx^)-@d=YL-V(gkfiCl z5-N#!X{3(ONs1O1BgNt$5BhV5hOX7%5oi*2g7?4&UHjz$7ljCz?#W@6bdFu| zh2sJQ4moXzd`LRILaVXi6hDDj$!p?)6&?t06exXvWf_SI8TXuE)ha&4j&T3s-okC^ zfpdqOZH?CtOQ*j|HL~GM1&usfL1Ss4Ok-)FOrsrGukj4i_}p0kJrC(WV|kt1$Hx{g zQk`tLP(de;R?t}*DAQRQDAUOUaBI93U!clzUh%J(T-a2k3mT+mdm=Lxybx^se{b_Bn60lM`~}PxpXxNrk6PVp#V!5 zB6cR!PVBFTMv47u$k)M%nuqJa38T(iN_5;3Xc%`-7u~3-*8a5f-zm9)6jI&3M+Cf zWN=chsG&qr`efGD!*goGO3ajX8%}m^m{h(Lp^K!u_)diG;_V1!ZH%@Pdv|mPvA+@Z z5qlv@SH$g~GMn@hijTGtKe2sRFrvyfC5@!0D_V&vNK7?DT&b;L5NOoA4xY2s%}~fk znnBe{H5senvhoE_Qx@U9h?QG2eKQRrG!|%!;iD5dP^`E zw5L_D7IoJ$cOT5DgI=2D42h;_DXKzRl#PR{YD){N$YNnd6=V6(-_^a?4-Hxy8GE!J z2MQf(m0psuEUGmgF-&=qUz!Nq(bW4?;??CiIhvA-R7j)?dLR$~Y&_mc;MJsA${T=5 zAABoL`=BSG`o=Z}eJMdfFD7EX$i|>foq{Y~+f7AES}ZxKax@(e)8S}oCq{NB{+qs+ z%cudO=k4psqYet;HO9MccAy-Pk3%_ z;*o!2+tePtm^VLpY}Phm_1G~xe)rgpe0<;I{;Kjun_D>k5Vlpk*VmGJ3nOew}|9rt(Yc>F&QqAQcumbwRnnvl1>J7 z>A)U;F=XdTnySi@sc0%jO~oj0XYly^j;*eu*KR*>V_wX8KKFigecAHBk$J}5WY;y7 zN!dE0sj`5cgO4(8_-D|&wziKv<`Tja5m7DE>zpx;1n*>n20WJP&3WKUzFDH{TM372&% z0lkb-y$$0VDWKnDwAFS^DY}^yW6BX(7tl?N>SBf^kxCIwS4085LaLQ)vVdMIkPcXe zq$_bVCX+S2j*+XlPJ71%^ae)umqS3eFr1gYI|cL?Txj$HdK06@xM&!pl}%dWgshu{ z^({y(`*Y`)cQ@iB#Losu7s;HB;#pA71#_XNoz)fG@0`8Yom0=b9qx7aHj4&fVAD3Z Hc)sQT9;hEt delta 3350 zcmaJ@Z%kX)6~EUZ@P+{so5c7JU_uf|00Y5TeW6u)10=O8g0!MX`3`vZDdXBI!$ZUMO8I*T@z`K?k{l_CmWf!B_7!(c}jd~(tak991V-=y12Tw~Pwno%2& zQX7y`>#&^q8l!$;{~V+CI63G!Fk^m?(lhZcqu1Ar-hhjl`j`5)adG3two$Yuq*L&EEcl!`}Lqmlh3;#ug&VGy#Ml|ygm>lwB5iSkI%qQta zgbEq{JLJW2*gHIqAB04^&82VP}2wKmepooqp!C}rdUyuOtGRQ8ADN)%sNTt6npMNqcja##?o8U3Ajo^8455Z51O$5IrHWT~@kske)c$na>poic{u$ADYU^~Iz3w9CwyI^aT zl^v=Z`l{T(g($lxL|H~c9)c60#$Mf`jvad~o0|8AQ>)pM6ITYMuqG--m011X3eo!i zB}9*SH#9(S|5$5_PPKzk%_kRUy+@ap=4X=m`oZeh9(P%|Kr%a%uUT%a?eh(8kI{0F z7UQ~t5xuUOu$mBfO$^D3#OE`lEy&PU#nm{kNXD&L;cHS8N%jYlTc@#FnGbT3ma^?^ z1(om*>C4S^S%iDZyEfHi(Y8J>gSB+;;nfw?MXK4J`^kOJZ^I7YqYWn7%G%;oJ|esyZ6ImgiT0A{@FU4?GC5#W{%K30O`fCQ zt3Qh>)f1{FM)aN~LS-y^AWU}k=S^*lq7@uzJr3o~&&6V`#JqyEYVjV%q#6G^Mw@Z> zc+}~?x6!lX)ab@|*!ek3Us9;iSw$YCNeXf}9*OFdR1Q;ds(2hAeH^fU`ZBp!3*ccJ z)T=h9$UceMqVbmK%MgE)2!7SsXdL&m{`JiN{tnxA8cKxcRX6ri2TQ?0FD$&T4!ZOh zb;Z-n2;ztC{-(Nu4~_c}Olp0E@+qycQlD96Hl&pAX+C088+YYxyzymx87{{!;)|>o zM(w$6D}n&~$u5U*~)$Zes)T zr!MB<#}CXJ5HhDv8~Tq<@5$>s&bYSGsgRqRx}S96Ty8pJa@oSjI-SfWS7)-q(n2OR zKSMtAB(0ncMrQXqEk{Plogh?mmLsyB!iVWqnJnNJf5~$cWhc1?F7D` z-UAm>hvARuBgOHGKGR(7gMX{2H5kLPz=uWHSbBV@bVhOL=eV?qap*;itcKr&q-b$I zES(e;4!s2HnVrg2jLb#H;!qBw2E&{*YLN^-RSr*3hhJcnpH_vT!=YbdRBimPOGp6@ z{R*yToWsAysC+PT=r_ce9V#eA`7nomi&0%^l{obJ#pOo)1~`^m9M?8eXI`otR|Jtm zZ^HPp!}%6Q#w_8`?=i~vW)8g#Ju6Q8JDceihAW4z!}{{hT{keY#CTOD-6oRYkBW-M zbLb|_uedCKA_Xa~`!`p5EadOWU!Q2fdD>smU*k~x%2 0 + $P!{LS_CATEGORIA} and trunc(cj.fechorventa) between trunc($P{DATA_INICIO}) and trunc($P{DATA_FINAL}) and ((cj.feccorrida is null) or ($P{PASSAGEM_ABERTA} = 'T')) order by em.nombempresa, es.cveestado, cj.fechorventa]]> @@ -75,12 +75,12 @@ - + - + @@ -185,32 +185,32 @@ new SimpleDateFormat("dd/MM/yyyy HH:mm:ss").format(new Date())]]> - + - + - + - + - + - + @@ -219,12 +219,12 @@ new SimpleDateFormat("dd/MM/yyyy HH:mm:ss").format(new Date())]]> - + - + diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioPassageirosViajarController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioPassageirosViajarController.java index 346c4b1ad..be230e206 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioPassageirosViajarController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioPassageirosViajarController.java @@ -13,6 +13,7 @@ import java.util.Map; import javax.sql.DataSource; +import org.apache.commons.lang.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Scope; import org.springframework.stereotype.Controller; @@ -186,15 +187,12 @@ public class RelatorioPassageirosViajarController extends MyGenericForwardCompos * */ private void executarPesquisa() { - HibernateSearchObject categoriaBusqueda = - new HibernateSearchObject(Categoria.class, - pagingCategoria.getPageSize()); + HibernateSearchObject categoriaBusqueda =new HibernateSearchObject(Categoria.class,pagingCategoria.getPageSize()); categoriaBusqueda.addFilterOr(Filter.like("desccategoria", "%" + txtPalavraPesquisa.getText().trim().toUpperCase().concat("%")), Filter.like("desccategoria", "%" + txtPalavraPesquisa.getText().trim().toUpperCase().concat("%"))); categoriaBusqueda.addSortAsc("desccategoria"); - categoriaBusqueda.addFilterEqual("activo", Boolean.TRUE); plwCategoria.init(categoriaBusqueda, categoriaList, pagingCategoria); @@ -227,13 +225,22 @@ public class RelatorioPassageirosViajarController extends MyGenericForwardCompos Empresa e = (Empresa) cmbEmpresa.getSelectedItem().getValue(); parametros.put("EMPRESA_ID", e.getEmpresaId().toString()); - lsNumCategoria = new ArrayList(Arrays.asList(categoriaSelList.getData())); - StringBuilder strNumCategoria = new StringBuilder(); - strNumCategoria.append("_"); - for (Categoria c : lsNumCategoria) { - strNumCategoria.append(c.getCategoriaId().toString() + '_'); + String strNumCategoria=""; + + StringBuilder sbCategoria = new StringBuilder(""); + if (categoriaSelList.getData().length != 0){ + + lsNumCategoria = new ArrayList(Arrays.asList(categoriaSelList.getData())); + + sbCategoria = new StringBuilder(" and cj.categoria_id in ( "); + for (Categoria c : lsNumCategoria) { + sbCategoria.append(c.getCategoriaId().toString()).append(","); + } + sbCategoria.delete(sbCategoria.length()-1,sbCategoria.length()); + sbCategoria.append(")"); } - parametros.put("LS_CATEGORIA", strNumCategoria.toString()); + + parametros.put("LS_CATEGORIA", sbCategoria.toString()); parametros.put("USUARIO", UsuarioLogado.getUsuarioLogado().getUsuarioId()); Relatorio relatorio = new RelatorioPassageirosViajar(parametros, dataSource.getConnection()); diff --git a/web/WEB-INF/i3-label_pt_BR.label b/web/WEB-INF/i3-label_pt_BR.label index 105b81c3b..d35667372 100644 --- a/web/WEB-INF/i3-label_pt_BR.label +++ b/web/WEB-INF/i3-label_pt_BR.label @@ -7,7 +7,7 @@ # . . = XXX #Versao do VentaBoleto: -versao = ADM_20130825_1RC208 +versao = ADM_20130826_1RC209 # MSG Defaut: MSG.CONSTRAINT.PORCENTAGEM = Os valores devem estar entre 0 e 100 diff --git a/web/gui/relatorios/filtroRelatorioPassageirosViajar.zul b/web/gui/relatorios/filtroRelatorioPassageirosViajar.zul index e07e6b8b0..5a66a41a8 100644 --- a/web/gui/relatorios/filtroRelatorioPassageirosViajar.zul +++ b/web/gui/relatorios/filtroRelatorioPassageirosViajar.zul @@ -34,7 +34,7 @@