From d1866c0d40f30d24e7292e4cc60f2eda59a30b4d Mon Sep 17 00:00:00 2001 From: "gleison.cruz" Date: Thu, 7 Mar 2024 09:48:52 -0300 Subject: [PATCH] fixes bug#AL-3731 --- pom.xml | 2 +- .../impl/RelatorioCheckinAberto.java | 18 ++-- .../templates/RelatorioCheckinAberto.jasper | Bin 28313 -> 30750 bytes .../templates/RelatorioCheckinAberto.jrxml | 84 +++++++++++++----- 4 files changed, 75 insertions(+), 29 deletions(-) diff --git a/pom.xml b/pom.xml index 54a4b47b7..bfc11efb8 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 br.com.rjconsultores ventaboletosadm - 1.55.5 + 1.55.6 war diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioCheckinAberto.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioCheckinAberto.java index c4ad5465a..99eee03b0 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioCheckinAberto.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioCheckinAberto.java @@ -90,7 +90,8 @@ public class RelatorioCheckinAberto extends Relatorio { bean.setServico(rs.getInt("servico")); bean.setDataServico(formatadorData.format(rs.getDate("data_servico"))); bean.setLocalidade(rs.getString("localidade")); - //bean.setUsuario(rs.getString("usuario")); + bean.setUsuario(rs.getString("usuario")); + bean.setImei(rs.getString("imei")); lsDadosRelatorio.add(bean); } @@ -121,12 +122,15 @@ public class RelatorioCheckinAberto extends Relatorio { private String getSql(String dataInicioServico, String dataFimServico, String dataInicioEncerramento, String dataFimEncerramento, Integer empresa_id, Integer localidade_id) { StringBuilder sb = new StringBuilder(); sb.append("select c.corrida_id as servico, "); - sb.append("c.feccorrida as data_servico, "); - sb.append("p.cveparada || ' - ' || p.descparada as localidade, "); - sb.append("cc.fechorcerrado as data_encerramento "); - sb.append("from corrida c "); - sb.append("join parada p on p.parada_id = c.origen_id "); - sb.append("left join checkin_cerrado cc on (c.corrida_id = cc.corrida_id and c.feccorrida=cc.feccorrida ) "); + sb.append(" c.feccorrida as data_servico, "); + sb.append(" p.cveparada || ' - ' || p.descparada as localidade, "); + sb.append(" cc.fechorcerrado as data_encerramento, "); + sb.append(" u.nombusuario as usuario, "); + sb.append(" cc.imei_embarcada as imei "); + sb.append(" from corrida c join parada p on p.parada_id = c.origen_id "); + sb.append(" left join checkin_cerrado cc on (c.corrida_id = cc.corrida_id and c.feccorrida=cc.feccorrida ) "); + sb.append(" left join usuario u on u.usuario_id = cc.usuario_id "); + if (empresa_id!=null) { diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioCheckinAberto.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioCheckinAberto.jasper index a64c25ecd27ad6be7ced2eff2a4ef06900e8d7ec..d43a686c78e001effc33dc12abb5bbdf28581f32 100644 GIT binary patch literal 30750 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 QtW)%M?BWmTv+m6Q1I+2PeE>SFC-iPf#e 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 W#AhIbUKg>?Y&T#VxKE#~=Knu{WBok< diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioCheckinAberto.jrxml b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioCheckinAberto.jrxml index 72802b783..e14f18642 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioCheckinAberto.jrxml +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioCheckinAberto.jrxml @@ -1,7 +1,7 @@ - + @@ -22,74 +22,74 @@ - + - + - + - + - + - + - + - + - + - + - + - + @@ -100,54 +100,96 @@ - + - + - + - + + + + + + + + + + + + + + + + + + + + + + - + - + - + + + + + + + + + + + + + + + + + + + + + + @@ -159,7 +201,7 @@ - +