From 599700137567403f54bd2e7666a00dcb6cedb2aa Mon Sep 17 00:00:00 2001 From: "gleison.cruz" Date: Wed, 24 Apr 2024 16:12:54 -0300 Subject: [PATCH] fixes bug#AL-3934 --- pom.xml | 2 +- .../impl/RelatorioReceitaServico.java | 16 +- .../templates/RelatorioReceitaServico.jasper | Bin 46909 -> 48705 bytes .../templates/RelatorioReceitaServico.jrxml | 160 +++++++++++------- 4 files changed, 114 insertions(+), 64 deletions(-) diff --git a/pom.xml b/pom.xml index e224402ef..cc64cab75 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 br.com.rjconsultores ventaboletosadm - 1.66.1 + 1.66.2 war diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioReceitaServico.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioReceitaServico.java index 7aaac6386..6f0b12bc7 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioReceitaServico.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioReceitaServico.java @@ -74,6 +74,8 @@ public class RelatorioReceitaServico extends Relatorio { 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") : ""); + dataResult.put("tipoServico", !(rset.getString("tipoServico") == null) ? rset.getString("tipoServico") : ""); + dataResult.put("prefixo", !(rset.getString("prefixo") == null) ? rset.getString("prefixo") : ""); this.dados.add(dataResult); } @@ -106,8 +108,20 @@ public class RelatorioReceitaServico extends Relatorio { 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("b.NUMFOLIOSISTEMA AS nrBilhete, "); + + sql.append(" CASE "); + sql.append(" WHEN c.tiposervicio_id = 1 THEN 'O' "); + sql.append(" WHEN c.tiposervicio_id = 2 THEN 'E' "); + sql.append(" ELSE '' "); + sql.append(" END AS tipoServico,"); + sql.append(" r.prefixo "); + sql.append("FROM BOLETO b "); + + sql.append(" left join corrida c on (b.corrida_id = c.corrida_id and b.feccorrida = c.feccorrida)"); + sql.append(" left join ruta r on (b.ruta_id = r.ruta_id and r.activo = 1) "); + sql.append("INNER JOIN marca mar ON b.marca_id = mar.marca_id "); sql.append("INNER JOIN clase_servicio cl_ser ON cl_ser.claseservicio_id = b.claseservicio_id "); sql.append("LEFT JOIN PARADA levante ON levante.parada_id = b.levante_id "); diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioReceitaServico.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioReceitaServico.jasper index 791c366213bab2fd8dc85deef9b6399f5c5d2da6..633292342c9d524a6763d832a067feffd8e4cc77 100644 GIT binary patch literal 48705 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 diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioReceitaServico.jrxml b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioReceitaServico.jrxml index 391ca4409..7e8afa96b 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioReceitaServico.jrxml +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioReceitaServico.jrxml @@ -1,7 +1,7 @@ - + - + @@ -30,6 +30,8 @@ + + @@ -48,7 +50,7 @@ - + @@ -88,14 +90,14 @@ - + - + @@ -103,7 +105,7 @@ - + @@ -111,7 +113,7 @@ - + @@ -119,7 +121,7 @@ - + @@ -127,7 +129,7 @@ - + @@ -138,7 +140,7 @@ - + @@ -160,7 +162,7 @@ - + @@ -170,7 +172,7 @@ - + @@ -180,7 +182,7 @@ - + @@ -190,7 +192,7 @@ - + @@ -200,7 +202,7 @@ - + @@ -210,7 +212,7 @@ - + @@ -220,7 +222,7 @@ - + @@ -230,7 +232,7 @@ - + @@ -240,7 +242,7 @@ - + @@ -250,7 +252,7 @@ - + @@ -260,7 +262,7 @@ - + @@ -270,7 +272,7 @@ - + @@ -280,7 +282,7 @@ - + @@ -290,7 +292,7 @@ - + @@ -300,7 +302,7 @@ - + @@ -310,7 +312,7 @@ - + @@ -320,7 +322,7 @@ - + @@ -330,7 +332,7 @@ - + @@ -339,149 +341,183 @@ + + + + + + + + + + + + + + + + + + + + - - - - + + + + - + - + - + - + - + - + - + - + - + - + - + - + - - + + - + - + - - + + - - + + - + + + + + + + + + + + + + + + - + @@ -489,40 +525,40 @@ - + - + - + - + - + - + - + @@ -531,7 +567,7 @@ - +