From beddf0cb68b599239923ecca0a1ef3032eccdcea Mon Sep 17 00:00:00 2001 From: Fabio Faria Date: Thu, 5 Oct 2023 10:31:03 -0300 Subject: [PATCH] =?UTF-8?q?Adi=C3=A7=C3=A3o=20de=20campos=20do=20passageir?= =?UTF-8?q?o=20feat=20bug#AL-3091?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 2 +- .../impl/RelatorioBilhetesVendidos.java | 14 +- .../RelatorioBilhetesVendidos.jasper | Bin 56129 -> 57644 bytes .../templates/RelatorioBilhetesVendidos.jrxml | 369 ++++++++++++------ .../RelatorioBilhetesVendidosController.java | 7 +- 5 files changed, 258 insertions(+), 134 deletions(-) diff --git a/pom.xml b/pom.xml index a2a326e4c..942b34d7c 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 br.com.rjconsultores ventaboletosadm - 1.23.2 + 1.24.0 war diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioBilhetesVendidos.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioBilhetesVendidos.java index 5b88e1b7d..3b129c150 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioBilhetesVendidos.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioBilhetesVendidos.java @@ -66,7 +66,11 @@ public class RelatorioBilhetesVendidos extends Relatorio { sql.append(" B.IMPORTEPEDAGIO PEDAGIO, "); sql.append(" B.IMPORTESEGURO SEGURO, "); sql.append(" u.NOMBUSUARIO BILHETEIRO, "); - sql.append(" uc.NOMBUSUARIO BILHETEIRO_CANCELAMENTO "); + sql.append(" uc.NOMBUSUARIO BILHETEIRO_CANCELAMENTO, "); + sql.append(" B.NOMBPASAJERO AS PASSAGEIRO, "); + sql.append(" B.DESCNUMDOC AS DOC, "); + sql.append(" COALESCE(b.NUMOPERACION, bo.NUMOPERACION) AS LOCALIZADOR "); + sql.append(" FROM caja B "); sql.append(" LEFT JOIN boleto bo ON (bo.boleto_id = b.transacaooriginal_id AND b.indstatusboleto = 'C') "); @@ -148,7 +152,10 @@ public class RelatorioBilhetesVendidos extends Relatorio { sql.append(" B.IMPORTEPEDAGIO PEDAGIO, "); sql.append(" B.IMPORTESEGURO SEGURO, "); sql.append(" u.NOMBUSUARIO BILHETEIRO, "); - sql.append(" uc.NOMBUSUARIO BILHETEIRO_CANCELAMENTO "); + sql.append(" uc.NOMBUSUARIO BILHETEIRO_CANCELAMENTO, "); + sql.append(" B.NOMBPASAJERO AS PASSAGEIRO, "); + sql.append(" B.DESCNUMDOC AS DOC, "); + sql.append(" COALESCE(b.NUMOPERACION, bo.NUMOPERACION) AS LOCALIZADOR "); sql.append(" FROM caja B "); sql.append(" LEFT JOIN boleto bo ON (bo.boleto_id = b.transacaooriginal_id AND b.indstatusboleto = 'C') "); @@ -270,6 +277,9 @@ public class RelatorioBilhetesVendidos extends Relatorio { dataResult.put("SEGURO", rset.getString("SEGURO")); dataResult.put("BILHETEIRO", rset.getString("BILHETEIRO")); dataResult.put("BILHETEIRO_CANCELAMENTO", rset.getString("BILHETEIRO_CANCELAMENTO")); + dataResult.put("PASSAGEIRO", rset.getString("PASSAGEIRO")); + dataResult.put("DOC", rset.getString("DOC")); + dataResult.put("LOCALIZADOR", rset.getString("LOCALIZADOR")); this.dados.add(dataResult); diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioBilhetesVendidos.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioBilhetesVendidos.jasper index b41f922b615e4fdc06fb0b730415a6b769f65165..452182d4825d79fcd37e27fb29bff7a9c3d4effc 100644 GIT binary patch literal 57644 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 Tbl*{T9m1^e(r~?6OAz~i%Piqp literal 56129 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 diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioBilhetesVendidos.jrxml b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioBilhetesVendidos.jrxml index 32bb0328b..64893363f 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioBilhetesVendidos.jrxml +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioBilhetesVendidos.jrxml @@ -1,8 +1,8 @@ - - - - + + + + @@ -65,13 +65,16 @@ + + + - + - + @@ -79,7 +82,7 @@ - + @@ -87,7 +90,7 @@ - + @@ -95,18 +98,15 @@ - + - - - - + @@ -114,7 +114,7 @@ - + @@ -122,7 +122,7 @@ - + @@ -130,7 +130,7 @@ - + @@ -138,7 +138,7 @@ - + @@ -146,14 +146,14 @@ - + - + @@ -161,7 +161,7 @@ - + @@ -170,413 +170,530 @@ - + - + + + + - + - + + + + - + - + + + + - + - + - + + + + - + - + + + + - + - + + + + - + - + + + + - + - + - + + + + - + - + + + + - + - + + + + - + - + - + + + + - + - + - + + + + - + - + + + + - + - + + + + - + - + + + + - + - + + + + - + - + + + + - + - + + + + - + - + + + + - + - + + + + - + - - - - - - - - - + + + + - + - + - + + + + - + - + - + + + + - + - + - + + + + - + - + + + + - + - + - + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - - - - - + - + - + - + - + - + - + + + + + + + + + + + + + + + + + + + + + + - + diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioBilhetesVendidosController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioBilhetesVendidosController.java index 0aee863f5..0db78c6f8 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioBilhetesVendidosController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioBilhetesVendidosController.java @@ -46,9 +46,6 @@ import com.rjconsultores.ventaboletos.web.utilerias.render.RenderRelatorioVendas @Scope("prototype") public class RelatorioBilhetesVendidosController extends MyGenericForwardComposer { - /** - * - */ private static final long serialVersionUID = 1L; @Autowired @@ -108,7 +105,7 @@ public class RelatorioBilhetesVendidosController extends MyGenericForwardCompose } private void executarPesquisaAgencia() { - HibernateSearchObject puntoVentaBusqueda = new HibernateSearchObject(PuntoVenta.class, pagingPuntoVenta.getPageSize()); + HibernateSearchObject puntoVentaBusqueda = new HibernateSearchObject<>(PuntoVenta.class, pagingPuntoVenta.getPageSize()); puntoVentaBusqueda.addFilterILike("nombpuntoventa", "%" + txtNombrePuntoVenta.getValue() + "%"); puntoVentaBusqueda.addFilterEqual("activo", Boolean.TRUE); @@ -202,7 +199,7 @@ public class RelatorioBilhetesVendidosController extends MyGenericForwardCompose parametros.put("DATA_INICIAL", (java.util.Date) this.datInicial.getValue()); parametros.put("DATA_FINAL", (java.util.Date) this.datFinal.getValue()); parametros.put("NOME_RELATORIO", Labels.getLabel("relatorioBilhetesVendidosController.window.title")); - parametros.put("USUARIO", UsuarioLogado.getUsuarioLogado().getUsuarioId().toString()); + parametros.put("USUARIO", UsuarioLogado.getUsuarioLogado().getNombusuario()); String status = ""; if (chkCancelado.isChecked()) {