From b050d83e246ed1037749d3e981e73c4c12444948 Mon Sep 17 00:00:00 2001 From: leonardo Date: Wed, 25 Mar 2015 13:48:27 +0000 Subject: [PATCH] fixes bug #6115 git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@42500 d1611594-4594-4d17-8e1d-87c2c4800839 --- .../relatorios/impl/RelatorioGratuidade.java | 5 +- .../templates/RelatorioGratuidade.jasper | Bin 41434 -> 43301 bytes .../templates/RelatorioGratuidade.jrxml | 183 ++++++++++-------- .../utilitarios/RelatorioGratuidadeBean.java | 8 + 4 files changed, 110 insertions(+), 86 deletions(-) diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioGratuidade.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioGratuidade.java index 390a89455..372cf4ecc 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioGratuidade.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioGratuidade.java @@ -77,7 +77,7 @@ public class RelatorioGratuidade extends Relatorio { gratuidadeBean.setPorccategoria(rset.getBigDecimal("porccategoria")); gratuidadeBean.setPreciooriginal(rset.getBigDecimal("preciooriginal")); gratuidadeBean.setPreciopagado(rset.getBigDecimal("preciopagado")); - + gratuidadeBean.setNombempresa(rset.getString("nombempresa")); lsDadosRelatorio.add(gratuidadeBean); } @@ -102,7 +102,7 @@ public class RelatorioGratuidade extends Relatorio { sql.append("SELECT b.feccorrida, ori.cveparada origen, des.cveparada destino, "); sql.append("b.numkmviaje, r.descruta, b.corrida_id, b.fechorviaje, "); sql.append("tv.desctipoventa, b.nombpasajero, b.descnumdoc, tar.preciooriginal, "); - sql.append("b.porccategoria, b.preciopagado, u.cveusuario, ag.nombpuntoventa "); + sql.append("b.porccategoria, b.preciopagado, u.cveusuario, ag.nombpuntoventa, e.nombempresa "); sql.append("FROM boleto b "); sql.append("JOIN categoria c ON b.categoria_id = c.categoria_id "); sql.append("JOIN grupo_categoria gc ON c.grupocategoria_id = gc.grupocategoria_id "); @@ -119,6 +119,7 @@ public class RelatorioGratuidade extends Relatorio { sql.append(" AND tar.vigenciatarifa_id = vt.vigenciatarifa_id "); sql.append(" AND tar.origen_id = b.origen_id "); sql.append(" AND tar.destino_id = b.destino_id) "); + sql.append("JOIN empresa e ON e.empresa_id = b.empresacorrida_id "); sql.append("WHERE "); sql.append(" gc.grupocategoria_id IN (1,2,3,4) "); sql.append("AND b.feccorrida BETWEEN :fecInicio AND :fecFinal "); diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioGratuidade.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioGratuidade.jasper index 09f3a6fbd7b7e2a1fbb4965e2ff4c722e054be39..b4be830fe90cbb73b291a8bd5c72cb4543d97d89 100644 GIT binary patch delta 14003 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 delta 12833 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 - + @@ -30,6 +30,7 @@ + @@ -39,6 +40,98 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -84,84 +177,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -277,24 +292,24 @@ - + - + - + - + - + diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/utilitarios/RelatorioGratuidadeBean.java b/src/java/com/rjconsultores/ventaboletos/relatorios/utilitarios/RelatorioGratuidadeBean.java index b14efd4f5..12bda27dc 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/utilitarios/RelatorioGratuidadeBean.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/utilitarios/RelatorioGratuidadeBean.java @@ -19,6 +19,8 @@ public class RelatorioGratuidadeBean { private BigDecimal preciopagado; private String cveusuario; private String nombpuntoventa; + private String nombempresa; + public Date getFeccorrida() { return feccorrida; } @@ -109,4 +111,10 @@ public class RelatorioGratuidadeBean { public void setNombpuntoventa(String nombpuntoventa) { this.nombpuntoventa = nombpuntoventa; } + public String getNombempresa() { + return nombempresa; + } + public void setNombempresa(String nombempresa) { + this.nombempresa = nombempresa; + } }