From 14b436a0ea35e0c31f2bd67219a241030ecd1c8c Mon Sep 17 00:00:00 2001 From: wilian Date: Tue, 30 Jun 2015 18:33:55 +0000 Subject: [PATCH] fixes bug #6421 git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@45545 d1611594-4594-4d17-8e1d-87c2c4800839 --- .../impl/RelatorioVendasPacotesDetalhado.java | 8 +- .../RelatorioVendasPacotesBoletosItem.jasper | Bin 35385 -> 40141 bytes .../RelatorioVendasPacotesBoletosItem.jrxml | 183 ++++++++++++---- ...RelatorioVendasPacotesDetalhadoItem.jasper | Bin 31737 -> 35851 bytes .../RelatorioVendasPacotesDetalhadoItem.jrxml | 199 +++++++++++++----- .../RelatorioVendasPacotesResumido.jasper | Bin 29683 -> 32227 bytes .../RelatorioVendasPacotesResumido.jrxml | 99 +++++++-- ...torioVendasPacotesDetalhadoController.java | 15 +- 8 files changed, 386 insertions(+), 118 deletions(-) diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioVendasPacotesDetalhado.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioVendasPacotesDetalhado.java index 43888ed5c..aeffddf89 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioVendasPacotesDetalhado.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioVendasPacotesDetalhado.java @@ -70,11 +70,11 @@ public class RelatorioVendasPacotesDetalhado extends Relatorio { if(fecFinal != null) { stmt.setDate("fecFinal", fecFinal); } - if (empresaId != null){ + if (empresaId != null && empresaId > 0){ stmt.setInt("empresaId", empresaId); } - if (pacoteId != null){ + if (pacoteId != null && pacoteId > 0){ stmt.setInt("pacoteId", pacoteId); } @@ -152,11 +152,11 @@ public class RelatorioVendasPacotesDetalhado extends Relatorio { .append("WHERE P.ACTIVO = 1 ") .append("AND (B.BOLETO_ID IS NULL OR (B.ACTIVO = 1 AND B.INDSTATUSBOLETO = 'V' AND B.MOTIVOCANCELACION_ID IS NULL)) "); - if(empresaId != null) { + if(empresaId != null && empresaId > 0) { sQuery.append("AND P.EMPRESA_ID = :empresaId "); } - if(pacoteId != null) { + if(pacoteId != null && pacoteId > 0) { sQuery.append("AND P.PACOTE_ID = :pacoteId "); } diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioVendasPacotesBoletosItem.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioVendasPacotesBoletosItem.jasper index 262fa248faa57eef7e2582264fc6581210ac4e1f..a79803da95cda0eaa5874cabf0c8acd92c044df6 100644 GIT binary patch delta 9105 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 T{{E=7xK}3D&KC04t9AbcFt(zR diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioVendasPacotesBoletosItem.jrxml b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioVendasPacotesBoletosItem.jrxml index d38c9591f..3dd63f3b8 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioVendasPacotesBoletosItem.jrxml +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioVendasPacotesBoletosItem.jrxml @@ -1,6 +1,6 @@ - - + + @@ -51,217 +51,328 @@ - + - + - + - + - + - + - + - + - + - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + - + - + - + - + - + - + - + - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - + - + - + - + - + - + - + - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioVendasPacotesDetalhadoItem.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioVendasPacotesDetalhadoItem.jasper index e4dbed44abfb2bee07fd2c24f8796b9187803e0c..6362ee747be083d87a5baf95eb37fe3f899c9e13 100644 GIT binary patch literal 35851 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 a?R@-I##CpFVGNU}9xAbI(W1^KME)Q2ULBJF delta 8222 zcmbuEdvFuS9mnrv{Ki^jWgeXj z&}q{$A%mIhq(dGJHBIwJr|~4CcG^s#^p7^376#nE+Ud~gV>-=rNZje94bw0!-QVus zc~7^pVsd}1&-?w|?tVYFyZ5`(rK^VjJe1%0G$%Xn^eRb`@)C0H>v_30d_C+lrWZfWLuY4%8o^bhesxkPf6#bTCbE5i%!647usD|ie5D5%U$TI*^$$A zCKj7MDQ!jax=o3{n@`I|KZKED7bx|hpjS)R6$d2g7o9PDr~!Ud?<~%t7sRH~Z}K;x zT#L;l2#g^)cQYEYSVXNPW-T`|ayzgYFeM|us|uYhw}kM>psUU{TnqiOgH(E{*3FM8 z4$-8TqH3>Rg%Jm6AdNYwkD0Do0Z|7V`)%*SN`jy}BTi~1&Hw4b9N}SVEfpcEaIA=l%=Qq+jU#oMTw?Ucd)%bqD zraGV6U@6w@_vgTt2hD9TH;MN81&~Q`Ti}|i#5Fw?xaI|oYbK;{eH&aiExY3tC%eWw z-Ws~&q54)6yYp`B|Cg%&|8BG#(D(;`ca@!y4qwFKj}S+S`vMMBB^>CffCDdRI4~gv zhx_U8zA2dlDt$_s_YK(nL)HC-r=HCHBDg2T1A%+068H2};GP#W?wOFn{e$%GOLXpE z+hi*wcl1n*r3xizZtKsLybg6YuQS;&6FB4;STjQL7~QF9Lhm*R5IvK2g2-9830lZ{ zL`+42mg4<1P>+bkP=QCJ2zU%6rBTu$Sq3=IEW1R^$#62_QvOtYI2ytU!Li7+;tTvk zN?<|*&Dkb3MdaZWH5SVTRMqHM=`%w%0UA;i3D8iLprNM%G`yfe!vr0gqV)4-T{0Tf zvYkF7DFiiJ)I)fE`^q6W0Rkx;0ti$k5a_7@0xxJFFhK{wk$!%ZCPRSvF)?{!Fh$Bp z(Wq%-5}NY{GC}wJM1KFTeFY~PfAy6u9i#27MM{RRjPSF*X~=GXMv58%G^$d8ybGbe zmYn^3E&tNN8l&MFe(VZmbn5!50e|B2VtVc;%haN zi5E2Jn4m*<0MPAQ7G0SDT`r(I6`dH4=*g)`ZVGZQ|K8kEJo1g4{J-?Pe7(@;7n6fI znm!klM}ZzGjtl5fmC-{7T2}ApYc%9|K|_uSI&#N>-0~kl%9F{Vn$}Xh7tKfPF~e_I~i@Eyxu1|FG{txV^sZ)7dZn@N<#62&72yynqx{c~X3hh7>PoNHIZ2>iP7f z96C~U?Ijl6Qe4V$Rl8j7TDLp4lx!zQ+v!DT=wFCri16@*RXIx&(q+32~FxZM$Lz5Hn z$)$QD#An8rf)jrKD>5G0-LMno2i6+od&m)R+TJAg3q~WSBDFK|k@4Ctye*Mt?xDVb z3tw;{uoHrB2CUgM_zS4gTaF$Dj8I(=wBwlSpdJ442Fvk3qro!x=VH*oU0_Fdf`w51 z2NLrr*xW4N!{4FtC<}re-Tq*x-|KI0^LEhAX-~$bVR# zPFPjtr=iWz--A#k?z|w}1pn*}gXL)0VN$>RFO1>U-WM$E;}Xda4bHffQD5uE zbJgI2xINMm85q)&TB0r1%;Vavv+)|0$(lNE2Tv0p9UZS=$aFn&v zoT{BXK|6HsQ5#t}YNmtfOVvoeppm3^eBz62SjJOi9}K9U0Ep*jQGfr54EatB{qtZI z`d5E*b|(D|4Ar^TnUv%zOMMU;E~7u&t?0`Gmh)_W(^op&&u2)W3<$;@b@X3f=2O^}nCLlsp0TEu%65$mM5hmz}TuV=+Qb)u*q!3Y(B^{BALr+HJ zT_8e=c>xis3W)H6mI$wCh%iA%WIjC+r;fJLq}wFR6r#C7e>R+fCwpW z3W!iuK!g{xM0iC*gb6w#H`5bw>4;Pwb7q{BHlzCNjfuZ)IxU+vQ!e(|xCUbsBaTy6X0y-z;ggX2ywvV|K|l52=wpr3V7+o38nTvL;$W}anhE5+s2vHs%vZQB~^8+UBk*1vU|yQzMAHvTPmc4kAuJ^oEc UQL-3EZ8diEcr+LN?^4140To0`3;+NC diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioVendasPacotesDetalhadoItem.jrxml b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioVendasPacotesDetalhadoItem.jrxml index 583b4085f..d4a5d3044 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioVendasPacotesDetalhadoItem.jrxml +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioVendasPacotesDetalhadoItem.jrxml @@ -1,6 +1,6 @@ - + @@ -35,188 +35,281 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + - + - + - + - + - + - + - + - + + + + + + + + + + + + + + + + + + + diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioVendasPacotesResumido.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioVendasPacotesResumido.jasper index 1d663d2c8577dff065de74dc0910f4dbfbb6b20b..1be6909b2eda93b43ba83f38c471e253b3bb1a52 100644 GIT binary patch delta 10364 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 - - - + + + @@ -60,9 +60,6 @@ - - - @@ -73,59 +70,101 @@ - + + + + - + - + - + - + + + + + + + + + + + + + + + + + + + - + + + + - + - + - + - + + + + + + + + + + + + + + + + + + + @@ -137,35 +176,53 @@ - + - + - + - + - + + + + + + + + + + + + + + + + + + + diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioVendasPacotesDetalhadoController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioVendasPacotesDetalhadoController.java index a3d50d113..d2e350a73 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioVendasPacotesDetalhadoController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioVendasPacotesDetalhadoController.java @@ -1,6 +1,7 @@ package com.rjconsultores.ventaboletos.web.gui.controladores.relatorios; import java.text.SimpleDateFormat; +import java.util.ArrayList; import java.util.Date; import java.util.HashMap; import java.util.List; @@ -61,8 +62,14 @@ public class RelatorioVendasPacotesDetalhadoController extends MyGenericForwardC @Override public void doAfterCompose(Component comp) throws Exception { - lsEmpresa = empresaService.obtenerTodos(); - lsPacote = pacoteService.obtenerTodos(); + lsEmpresa = new ArrayList(); + lsEmpresa.add(new Empresa(-1, "TODAS")); + lsEmpresa.addAll(empresaService.obtenerTodos()); + + lsPacote = new ArrayList(); + lsPacote.add(new Pacote(-1, "TODOS")); + lsPacote.addAll(pacoteService.obtenerTodos()); + super.doAfterCompose(comp); } @@ -77,7 +84,7 @@ public class RelatorioVendasPacotesDetalhadoController extends MyGenericForwardC Comboitem cbiEmpresa = cmbEmpresa.getSelectedItem(); String empresaId = null; - parametros.put("empresa", ""); + parametros.put("empresa", "TODAS"); if (cbiEmpresa != null) { Empresa empresa = (Empresa) cbiEmpresa.getValue(); empresaId = empresa.getEmpresaId().toString(); @@ -87,7 +94,7 @@ public class RelatorioVendasPacotesDetalhadoController extends MyGenericForwardC Comboitem cbiPacote = cmbPacote.getSelectedItem(); String pacoteId = null; - parametros.put("nompacote", "Todos"); + parametros.put("nompacote", "TODOS"); if (cbiPacote != null) { Pacote pacote = (Pacote) cbiPacote.getValue(); pacoteId = pacote.getPacoteId().toString();