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 a64c25ecd..d43a686c7 100644
Binary files a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioCheckinAberto.jasper and b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioCheckinAberto.jasper differ
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 @@
-
+