From 45ce420e9a02d8846ae4c901e5b75761755b360e Mon Sep 17 00:00:00 2001 From: fabio Date: Tue, 5 Apr 2022 21:33:48 +0000 Subject: [PATCH] fixes bug#24149 dev: Celio qua: git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@111695 d1611594-4594-4d17-8e1d-87c2c4800839 --- .../impl/RelatorioReceitaServico.java | 7 +- .../templates/RelatorioReceitaServico.jasper | Bin 46143 -> 46835 bytes .../templates/RelatorioReceitaServico.jrxml | 263 ++++++++++++------ .../RelatorioReceitaServicoController.java | 30 +- 4 files changed, 179 insertions(+), 121 deletions(-) diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioReceitaServico.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioReceitaServico.java index 15aa7bf95..7aaac6386 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioReceitaServico.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioReceitaServico.java @@ -14,8 +14,7 @@ import com.rjconsultores.ventaboletos.web.utilerias.NamedParameterStatement; public class RelatorioReceitaServico extends Relatorio { - public RelatorioReceitaServico(Map parametros, Connection conexao) throws Exception - { + public RelatorioReceitaServico(Map parametros, Connection conexao) throws Exception { super(parametros, conexao); this.setCustomDataSource(new ArrayDataSource(this) { @@ -51,8 +50,6 @@ public class RelatorioReceitaServico extends Relatorio { if (parametros.get("CLASESERVICIO_ID") != null && (!parametros.get("CLASESERVICIO_ID").equals(""))) stmt.setInt("CLASESERVICIO_ID", (Integer) parametros.get("CLASESERVICIO_ID")); - // else - // stmt.setNull("CLASESERVICIO_ID", java.sql.Types.INTEGER); ResultSet rset = stmt.executeQuery(); @@ -73,6 +70,7 @@ public class RelatorioReceitaServico extends Relatorio { dataResult.put("total", rset.getBigDecimal("total")); dataResult.put("tipo", rset.getString("tipo")); dataResult.put("agencia", rset.getString("agencia")); + dataResult.put("telefone", rset.getString("telefone")); dataResult.put("dataHoraCompra", rset.getTimestamp("dataHoraCompra")); dataResult.put("passageiro", !(rset.getString("passageiro") == null) ? rset.getString("passageiro") : ""); dataResult.put("nrBilhete", !(rset.getString("nrBilhete") == null) ? rset.getString("nrBilhete") : ""); @@ -107,6 +105,7 @@ public class RelatorioReceitaServico extends Relatorio { sql.append("p.nombpuntoventa AS agencia, "); sql.append("b.fechorventa AS dataHoraCompra, "); sql.append("b.nombpasajero AS passageiro, "); + sql.append("b.desctelefono AS telefone, "); sql.append("b.NUMFOLIOSISTEMA AS nrBilhete "); sql.append("FROM BOLETO b "); sql.append("INNER JOIN marca mar ON b.marca_id = mar.marca_id "); diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioReceitaServico.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioReceitaServico.jasper index 6f4db5a41b3fc6f390bfc5b78601f444540a6737..a691680753fb53c018a5dd76d4856b84b4e5a507 100644 GIT binary patch literal 46835 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 literal 46143 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 JquMzc{XbV75i0-y diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioReceitaServico.jrxml b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioReceitaServico.jrxml index c7e5c0648..3f639cd42 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioReceitaServico.jrxml +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioReceitaServico.jrxml @@ -1,6 +1,6 @@ - - + + @@ -29,6 +29,7 @@ + @@ -45,9 +46,9 @@ - + - + @@ -55,7 +56,7 @@ - + @@ -63,7 +64,7 @@ - + @@ -71,7 +72,7 @@ - + @@ -79,7 +80,7 @@ - + @@ -87,33 +88,30 @@ - - + + - + - - - - - + + - + @@ -121,329 +119,410 @@ - - + + - + - - - - + + + + + + + + + + + + + - + - + + + + - + + + + - + + + + - + + + + - + + + + - + + + + - - - - - - - - + + + + - + + + + - + + + + - + + + + - + + + + - + + + + - + + + + - + + + + - + + + + - - - - + + + + - + + + + + + + + + + + + + + + + + + + + + + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - - - - - + - + - + + + + + + + + + + + + + + + - + - - + + + - - + + + - - + + + - - + + + - + - + - + - + @@ -452,8 +531,8 @@ - - + + diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioReceitaServicoController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioReceitaServicoController.java index 6520835ca..996505793 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioReceitaServicoController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioReceitaServicoController.java @@ -1,6 +1,5 @@ package com.rjconsultores.ventaboletos.web.gui.controladores.relatorios; -import java.util.Calendar; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -124,16 +123,13 @@ public class RelatorioReceitaServicoController extends MyGenericForwardComposer } catch (InterruptedException ex) { ex.printStackTrace(); } - } else - { + } else { Relatorio relatorio; Map parametros = new HashMap(); - StringBuilder filtro = new StringBuilder(); - if (null != txtCorridaId.getValue() && !("".equals(txtCorridaId.getValue()))) - { + if (null != txtCorridaId.getValue() && !("".equals(txtCorridaId.getValue()))){ filtro.append("Serviço: "); filtro.append(txtCorridaId.getValue() + "; "); parametros.put("CORRIDA_ID", txtCorridaId.getValue()); @@ -142,19 +138,6 @@ public class RelatorioReceitaServicoController extends MyGenericForwardComposer parametros.put("CORRIDA_ID", null); } - filtro.append("Início período: "); - Calendar cal = Calendar.getInstance(); - cal.setTime(datInicial.getValue()); - filtro.append(cal.get(Calendar.DATE) + "/"); - filtro.append((cal.get(Calendar.MONTH) + 1) + "/"); - filtro.append(cal.get(Calendar.YEAR) + "; "); - - filtro.append("Fim período: "); - cal.setTime(datFinal.getValue()); - filtro.append(cal.get(Calendar.DATE) + "/"); - filtro.append((cal.get(Calendar.MONTH) + 1) + "/"); - filtro.append(cal.get(Calendar.YEAR) + "; "); - parametros.put("DATA_INICIAL", (java.util.Date) datInicial.getValue()); parametros.put("DATA_FINAL", (java.util.Date) datFinal.getValue()); @@ -164,8 +147,7 @@ public class RelatorioReceitaServicoController extends MyGenericForwardComposer if (origem.getParadaId() != -1) { parametros.put("ORIGEN_ID", origem.getParadaId()); filtro.append("Origem: " + origem.getCveparada() + "; "); - } - else { + } else { parametros.put("ORIGEN_ID", null); filtro.append("Origem: Todas; "); } @@ -177,8 +159,7 @@ public class RelatorioReceitaServicoController extends MyGenericForwardComposer Comboitem cbiDestino = cmbParadaDestino.getSelectedItem(); if (cbiDestino != null) { Parada destino = (Parada) cbiDestino.getValue(); - if (destino.getParadaId() != -1) - { + if (destino.getParadaId() != -1) { parametros.put("DESTINO_ID", destino.getParadaId()); filtro.append("Destino: " + destino.getCveparada() + "; "); } else { @@ -206,8 +187,7 @@ public class RelatorioReceitaServicoController extends MyGenericForwardComposer if (clase.getClaseservicioId() == -1) { parametros.put("CLASESERVICIO_ID", ""); filtro.append("Classe: " + clase.getDescclase() + "; "); - } - else { + } else { parametros.put("CLASESERVICIO_ID", clase.getClaseservicioId()); } filtro.append("Classe: " + clase.getDescclase() + "; ");