From 5df73afd678ce9809ac213973d5131de626e0282 Mon Sep 17 00:00:00 2001 From: julio Date: Tue, 16 Jul 2013 15:18:43 +0000 Subject: [PATCH] =?UTF-8?q?ALTERA=C3=87=C3=95ES=20E=20CORRE=C3=87=C3=95ES?= =?UTF-8?q?=20NO=20RELATORIO=20DE=20TRECHO=20VENDIDO?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@29139 d1611594-4594-4d17-8e1d-87c2c4800839 --- .../templates/RelatorioTrechoVendido.jasper | Bin 38439 -> 38439 bytes .../templates/RelatorioTrechoVendido.jrxml | 38 +++++++++--------- .../RelatorioTrechoVendidoController.java | 19 +++++---- 3 files changed, 28 insertions(+), 29 deletions(-) diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioTrechoVendido.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioTrechoVendido.jasper index 00328140b72256f677a64f7b63a7542919b9692b..95f81f186a7564d108c0a8ac730de9275e7ee1da 100644 GIT binary patch delta 258 zcmZ3!hH3d4rVUFJ7{5<;l-JyRPQjR+)sBII@$KY!YMPVvH6AiDZWh#xVFXfnTCqTC z@)>PER%xJ$Lz53`X-@Xg0jbc^-7h%#p9;t1k9LJXT4=JGi_GK+_TEsV>})kBb2@+& zzIG@8nQ_2bWOIR&KZF?qH4dc8$pxqiEN$T`q|7SCz`!6fSuk65b4i97BkN~4_e!P( zBjfzdyxA#?jMpafW@~Pqo#V*NZ((R@Vqj`&7H@85X<%Zu`E~veRUtIN5(cBmhU_wv MKjd*vmYT*30FDz+i2wiq delta 270 zcmZ3!hH3d4rVUFJ7(Y*Tl-JyRPQjRc@&W}GAork_=45@1hm+-$1ve{d`Y?hSby~h) z#^gKNcB}#n42;LX>O6EH>a29v3o@!teq~p|sm=felVx30Cr_~VW;FpS|2#R+QFAh< z!$U@f&95B_7#SHRA8;1gT;SvnVTM2r1*vj!0jdH^Teu1-vx))D6PYZSt-84+!;F#j zJ)CH_y&-Wac+CH8wIcH8qVlHMcM{u-N=M|A(p&nqUco S(PTq*naLmWI44U@;{^bOYf&5k diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioTrechoVendido.jrxml b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioTrechoVendido.jrxml index fe77906b4..a2d5e3999 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioTrechoVendido.jrxml +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioTrechoVendido.jrxml @@ -113,28 +113,28 @@ ORDER BY - + - + - - + + - + - + - - + + @@ -195,22 +195,22 @@ ORDER BY - + - + - + - + @@ -239,7 +239,7 @@ ORDER BY - + @@ -260,23 +260,23 @@ ORDER BY - - + + - + - + - - + + diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioTrechoVendidoController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioTrechoVendidoController.java index 68d6f3eef..d8371cbe6 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioTrechoVendidoController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioTrechoVendidoController.java @@ -75,26 +75,25 @@ public class RelatorioTrechoVendidoController extends MyGenericForwardComposer { try { puntuVentaId = Integer.parseInt(lsNumPuntoVenta.iterator().next()); } catch (Exception e) { - log.error(e.getStackTrace()); + log.error(e.getMessage()); } parametros.put("PUNTOVENTA_ID", puntuVentaId); } String empresa = ""; try { - empresa = cmbEmpresa.getValue(); - + Empresa e = (Empresa) cmbEmpresa.getSelectedItem().getValue(); + if (!e.equals(null)) { + empresa = e.getNombempresa(); + } + } catch (NullPointerException e) { + empresa = ""; } catch (Exception e) { - log.error(e.getStackTrace()); + log.error(e.getMessage()); } parametros.put("NOMBEMPRESA", empresa); - String empresaSearch = ""; - if (!empresa.equals(null)) { - empresaSearch = "%" + empresa + "%"; - } else { - empresaSearch = "%%"; - } + String empresaSearch = "%" + empresa + "%"; parametros.put("NOMBEMPRESA_SEARCH", empresaSearch); Date now = new Date();