From 85deb5d854de5e11a9354355a5b14749afb7b074 Mon Sep 17 00:00:00 2001 From: fabio Date: Thu, 9 Sep 2021 19:51:44 +0000 Subject: [PATCH] fixes bug#23182 dev: Aristides qua: git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@108662 d1611594-4594-4d17-8e1d-87c2c4800839 --- .../impl/RelatorioEncerramentoCheckin.java | 6 ++-- ...RelatorioEncerramentoCheckin_es.properties | 3 +- ...atorioEncerramentoCheckin_pt_BR.properties | 3 +- .../RelatorioEncerramentoCheckin.jasper | Bin 29737 -> 30732 bytes .../RelatorioEncerramentoCheckin.jrxml | 33 +++++++++++++----- .../RelatorioEncerramentoCheckinBean.java | 9 +++++ 6 files changed, 41 insertions(+), 13 deletions(-) diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioEncerramentoCheckin.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioEncerramentoCheckin.java index 96cfe0ca8..5f0a3e597 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioEncerramentoCheckin.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioEncerramentoCheckin.java @@ -92,6 +92,7 @@ public class RelatorioEncerramentoCheckin extends Relatorio { bean.setLocalidade(rs.getString("localidade")); bean.setDataEncerramento(formatadorDataHora.format(rs.getDate("data_encerramento"))); bean.setUsuario(rs.getString("usuario")); + bean.setImei(rs.getString("imei")); lsDadosRelatorio.add(bean); } @@ -125,9 +126,10 @@ public class RelatorioEncerramentoCheckin extends Relatorio { sb.append("cc.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("u.nombusuario as usuario, "); + sb.append("cc.imei_embarcada as imei "); sb.append("from checkin_cerrado cc "); - sb.append("join corrida c on c.corrida_id = cc.corrida_id "); + sb.append("join corrida c on c.corrida_id = cc.corrida_id and c.feccorrida = cc.feccorrida "); sb.append("join parada p on p.parada_id = cc.origen_id "); sb.append("join usuario u on u.usuario_id = cc.usuario_id "); diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioEncerramentoCheckin_es.properties b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioEncerramentoCheckin_es.properties index 0e6b93c1a..7073dc9ff 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioEncerramentoCheckin_es.properties +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioEncerramentoCheckin_es.properties @@ -14,4 +14,5 @@ detail.servico=Servi detail.data.servico=Data Serviço detail.localidade=Localidade detail.data.encerramento=Data Encerramento -detail.usuario.operacao=Usuário da Operação \ No newline at end of file +detail.usuario.operacao=Usuário da Operação +detail.imei=Dispositivo \ No newline at end of file diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioEncerramentoCheckin_pt_BR.properties b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioEncerramentoCheckin_pt_BR.properties index 0e6b93c1a..7073dc9ff 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioEncerramentoCheckin_pt_BR.properties +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioEncerramentoCheckin_pt_BR.properties @@ -14,4 +14,5 @@ detail.servico=Servi detail.data.servico=Data Serviço detail.localidade=Localidade detail.data.encerramento=Data Encerramento -detail.usuario.operacao=Usuário da Operação \ No newline at end of file +detail.usuario.operacao=Usuário da Operação +detail.imei=Dispositivo \ No newline at end of file diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioEncerramentoCheckin.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioEncerramentoCheckin.jasper index 2752f075aaee24dceb336f9afef2d83c339183de..cf9cf82f3c08fdf03a1fb414b1790783c60b4a65 100644 GIT binary patch delta 8850 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 delta 8339 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 - - + + @@ -12,6 +12,7 @@ + @@ -24,7 +25,7 @@ - + @@ -55,21 +56,21 @@ - + - + - + @@ -130,16 +131,23 @@ - + + + + + + + + - + @@ -169,12 +177,19 @@ - + + + + + + + + diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/utilitarios/RelatorioEncerramentoCheckinBean.java b/src/java/com/rjconsultores/ventaboletos/relatorios/utilitarios/RelatorioEncerramentoCheckinBean.java index 98cf4b40a..4aa6041f7 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/utilitarios/RelatorioEncerramentoCheckinBean.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/utilitarios/RelatorioEncerramentoCheckinBean.java @@ -7,6 +7,7 @@ public class RelatorioEncerramentoCheckinBean { private String localidade; private String dataEncerramento; private String usuario; + private String imei; public Integer getServico() { return servico; @@ -47,4 +48,12 @@ public class RelatorioEncerramentoCheckinBean { public void setUsuario(String usuario) { this.usuario = usuario; } + + public String getImei() { + return imei; + } + + public void setImei(String imei) { + this.imei = imei; + } } \ No newline at end of file