From e4eccf6a81dc11003923fa3d840578efeb5e2f36 Mon Sep 17 00:00:00 2001 From: rodrigo Date: Wed, 21 Aug 2013 20:20:10 +0000 Subject: [PATCH] git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@29983 d1611594-4594-4d17-8e1d-87c2c4800839 --- .../relatorios/impl/RelatorioTaxasLinha.java | 24 +- .../templates/RelatorioTaxasLinha.jasper | Bin 49348 -> 49416 bytes .../templates/RelatorioTaxasLinha.jrxml | 76 +++--- .../RelatorioTaxasLinhaController.java | 244 +++++++++++------- .../RenderRelatorioTaxasLinhaPuntoVenta.java | 31 +++ ...torioTaxasLinhaPuntoVentaSelecionados.java | 53 ++++ web/WEB-INF/i3-label_pt_BR.label | 5 +- .../relatorios/filtroRelatorioTaxasLinha.zul | 102 +++++--- 8 files changed, 354 insertions(+), 181 deletions(-) create mode 100644 src/java/com/rjconsultores/ventaboletos/web/utilerias/render/RenderRelatorioTaxasLinhaPuntoVenta.java create mode 100644 src/java/com/rjconsultores/ventaboletos/web/utilerias/render/RenderRelatorioTaxasLinhaPuntoVentaSelecionados.java diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioTaxasLinha.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioTaxasLinha.java index 49ad0a06d..fd63c97e2 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioTaxasLinha.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioTaxasLinha.java @@ -28,15 +28,14 @@ public class RelatorioTaxasLinha extends Relatorio { */ public RelatorioTaxasLinha(Map parametros, Connection conexao) throws Exception { super(parametros, conexao); - // TODO Auto-generated constructor stub this.setCustomDataSource(new DataSource(this) { public void initDados() throws Exception { - Connection conexao = this.relatorio.getConexao(); Map parametros = this.relatorio.getParametros(); - String sql = getSql(); + String puntosVentaIds = (String) parametros.get("NUMPUNTOVENTA"); + String sql = getSql(puntosVentaIds); NamedParameterStatement stmt = new NamedParameterStatement(conexao, sql); stmt.setInt("TIPO_DATA", (Integer) parametros.get("TIPO_DATA")); @@ -48,11 +47,6 @@ public class RelatorioTaxasLinha extends Relatorio { else stmt.setNull("EMPRESA_ID", java.sql.Types.INTEGER); - if (parametros.get("NUMPUNTOVENTA") != null) - stmt.setString("NUMPUNTOVENTA", (String) parametros.get("NUMPUNTOVENTA")); - else - stmt.setNull("NUMPUNTOVENTA", java.sql.Types.VARCHAR); - if (parametros.get("ORIGEN_ID") != null) stmt.setInt("ORIGEN_ID", (Integer) parametros.get("ORIGEN_ID")); else @@ -64,7 +58,6 @@ public class RelatorioTaxasLinha extends Relatorio { stmt.setNull("DESTINO_ID", java.sql.Types.INTEGER); this.resultSet = stmt.executeQuery(); - } public Object valueCustomFields(String fieldName) throws Exception { @@ -110,7 +103,6 @@ public class RelatorioTaxasLinha extends Relatorio { } return null; } - }); } @@ -121,8 +113,6 @@ public class RelatorioTaxasLinha extends Relatorio { */ @Override protected void processaParametros() throws Exception { - // TODO Auto-generated method stub - } public HashMap getConfigImposto(Integer puntoVentaId) throws Exception { @@ -140,8 +130,7 @@ public class RelatorioTaxasLinha extends Relatorio { return cacheConfig; } - private String getSql() { - + private String getSql(String puntosVentaIds) { StringBuilder sql = new StringBuilder(); sql.append(" SELECT RT.PREFIXO, "); @@ -187,7 +176,11 @@ public class RelatorioTaxasLinha extends Relatorio { sql.append(" AND DECODE(:TIPO_DATA, 1, CJ.FECCORRIDA, 2, CJ.FECHORVENTA) BETWEEN "); sql.append(" :DATA_INICIAL AND :DATA_FINAL "); sql.append(" AND EM.EMPRESA_ID = NVL(:EMPRESA_ID, EM.EMPRESA_ID) "); - sql.append(" AND PV.NUMPUNTOVENTA = NVL(:NUMPUNTOVENTA, PV.NUMPUNTOVENTA) "); + + if (!puntosVentaIds.equals("Todas")) { + sql.append(" AND PV.NUMPUNTOVENTA IN (").append(puntosVentaIds).append(") "); + } + sql.append(" AND PO.PARADA_ID = NVL(:ORIGEN_ID, PO.PARADA_ID) "); sql.append(" AND PD.PARADA_ID = NVL(:DESTINO_ID, PD.PARADA_ID) "); sql.append(" GROUP BY RT.PREFIXO, "); @@ -205,5 +198,4 @@ public class RelatorioTaxasLinha extends Relatorio { return sql.toString(); } - } diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioTaxasLinha.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioTaxasLinha.jasper index 51fa6b743741fc6588dd2b594b78a817ea4647f4..0bcd6f4a98e592974713281e5d1092aae3348b13 100644 GIT binary patch delta 5445 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 vaxx=SclsY@G8U>jf7wXJXw~_~(8^y - - + +