fabio
/
AdmMono
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixes bug #6084 

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@41766 d1611594-4594-4d17-8e1d-87c2c4800839
master
wilian 2015-02-25 22:12:44 +00:00
parent fece4dbc1e
commit 6cd54e3884
2 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioEmpresaOnibus.java
View File

@ -116,18 +116,13 @@ public class RelatorioEmpresaOnibus extends Relatorio {
return result;
}
SimpleDateFormat formatter = new SimpleDateFormat("HH:mm");
Date h1;
Date h2;
try {
h1 = formatter.parse(o1.getHora());
h2 = formatter.parse(o2.getHora());
SimpleDateFormat formatter = new SimpleDateFormat("HH:mm");
Date h1 = formatter.parse(o1.getHora());
Date h2 = formatter.parse(o2.getHora());
result = h1.compareTo(h2);
} catch (ParseException e) {
return result;
}
result = h1.compareTo(h2);
return result;
}
});
@ -155,7 +150,7 @@ public class RelatorioEmpresaOnibus extends Relatorio {
sql.append(" o.cveparada origem, d.cveparada destino, ");
sql.append(" to_char(c.fechorsalida, 'HH24:MI') Hora, t.cantkmreal KMTS, ct.numsecuencia ");
sql.append(" from corrida c ");
sql.append(" inner join corrida_tramo ct on ct.corrida_id = c.corrida_id ");
sql.append(" inner join corrida_tramo ct on ct.corrida_id = c.corrida_id and c.feccorrida = ct.feccorrida ");
sql.append(" inner join tramo t on t.tramo_id = ct.tramo_id ");
sql.append(" inner join parada o on o.parada_id = ct.origen_id ");
sql.append(" inner join parada d on d.parada_id = ct.destino_id ");

2
src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioEmpresaOnibusResumo.java
View File

@ -99,10 +99,10 @@ public class RelatorioEmpresaOnibusResumo extends Relatorio {
sql.append(" parada d ");
sql.append("WHERE c.activo = 1 ");
sql.append(" AND ct.corrida_id = c.corrida_id ");
sql.append(" AND c.feccorrida = ct.feccorrida ");
sql.append(" AND t.tramo_id = ct.tramo_id ");
sql.append(" AND ct.activo = 1 ");
sql.append(" AND c.feccorrida BETWEEN :fecInicio and :fecFinal ");
sql.append(" AND ct.feccorrida BETWEEN :fecInicio and :fecFinal ");
sql.append(" AND a.autobus_id = ct.autobus_id ");
sql.append(" AND e.empresa_id = a.empresa_id ");
sql.append(" AND o.parada_id = ct.origen_id ");