diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioCheckin.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioCheckin.java index a56b73bfe..dcd8c4824 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioCheckin.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioCheckin.java @@ -97,7 +97,7 @@ public class RelatorioCheckin extends Relatorio { sql.append(" then b.numfoliosistema else b.numoperacion end numoperacion, "); sql.append("b.feccorrida, bc.datavenda, bc.datacancelado, bc.dataremarcacao, u.nombusuario, u.cveusuario "); sql.append("from boleto b "); - sql.append("inner join boleto_checkin bc on b.boletooriginal_id = bc.boletooriginal_id "); + sql.append("inner join boleto_checkin bc on b.boleto_id = bc.boletooriginal_id "); sql.append("inner join parada o on b.origen_id = o.parada_id "); sql.append("inner join usuario u on b.usuario_id = u.usuario_id "); sql.append(" where b.activo = 1 "); @@ -105,6 +105,7 @@ public class RelatorioCheckin extends Relatorio { sql.append(corridaId == null ? "" : " and b.corrida_id = ? "); sql.append(origenId == null ? "" : " and b.origen_id = ? "); sql.append((lsInt == null || lsInt.size() == 0) ? "" : " and u.USUARIO_ID in ( "+ createIn(lsInt.size()) + ") "); + sql.append(" order by bc.datacancelado desc"); return sql.toString(); } diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioCheckin.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioCheckin.jasper index 360c65b9c..71fdfc0f5 100644 Binary files a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioCheckin.jasper and b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioCheckin.jasper differ diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioCheckin.jrxml b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioCheckin.jrxml index 15a2699bf..57058e880 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioCheckin.jrxml +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioCheckin.jrxml @@ -1,7 +1,7 @@ - + @@ -141,7 +141,7 @@ - +