From 28e6bd73c1b4a2d2840f1b7be21cbcaec064036c Mon Sep 17 00:00:00 2001 From: fabio Date: Sat, 12 Sep 2020 12:31:35 +0000 Subject: [PATCH] fixes bug#20335 dev: qua: git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@103283 d1611594-4594-4d17-8e1d-87c2c4800839 --- .../relatorios/impl/RelatorioMmphDer.java | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioMmphDer.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioMmphDer.java index a915bb5e4..1b17b0b9b 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioMmphDer.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioMmphDer.java @@ -43,11 +43,11 @@ public class RelatorioMmphDer extends Relatorio { sql.append(" to_char( b.fechorviaje, 'DD') as dia, "); sql.append(" r.indsentidoida as sentido, "); sql.append(" da.cantasientos as assentos, "); - sql.append(" TO_CHAR( b.fechorviaje ,'HH24:mi') as horario, "); + sql.append(" TO_CHAR( ec.horasalida ,'HH24:mi') as horario, "); sql.append(" b.CORRIDA_ID as servico, "); sql.append(" cs.descclase as classe, "); sql.append(" max(ct.fechorllegada-ct.fechorsalida)*24*60 as tempo,"); - sql.append(" MAX(tr.CANTKMREAL) as km, "); + sql.append(" SUM(distinct NVL( RS.KMORIGINAL,0)) as km, "); sql.append(" e.codder, "); sql.append(" sum(CASE "); sql.append(" WHEN co.tiposervicio_id = 2 THEN 1 ELSE 0 "); @@ -66,18 +66,19 @@ public class RelatorioMmphDer extends Relatorio { sql.append(" INNER JOIN empresa e "); sql.append(" on m.empresa_id = e.empresa_id "); sql.append(" and e.activo = 1 "); + sql.append(" INNER JOIN esquema_corrida ec "); + sql.append(" on co.esquemacorrida_id = ec.esquemacorrida_id "); sql.append(" left join rol_operativo ro "); sql.append(" on ro.roloperativo_id = co.roloperativo_id "); sql.append(" left join diagrama_autobus da "); sql.append(" on ro.diagramaautobus_id = da.diagramaautobus_id "); sql.append(" left join clase_servicio cs "); sql.append(" on co.claseservicio_id = cs.claseservicio_id "); - sql.append(" left join tramo tr "); - sql.append(" on tr.ORIGEN_ID = b.origen_id "); - sql.append(" and tr.DESTINO_ID = b.destino_id "); - sql.append(" and tr.ACTIVO = 1 "); + sql.append(" left join ruta_secuencia rs "); + sql.append(" on rs.ruta_id = co.ruta_id "); + sql.append(" AND rs.activo = 1 "); sql.append(" left join corrida_tramo ct "); - sql.append(" on ct.tramo_id = tr.tramo_id "); + sql.append(" on ct.tramo_id = rs.tramo_id "); sql.append(" and b.corrida_id = ct.corrida_id "); sql.append(" and b.feccorrida = ct.feccorrida "); sql.append(" and ct.activo = 1 "); @@ -97,7 +98,7 @@ public class RelatorioMmphDer extends Relatorio { sql.append(" to_char(b.fechorviaje, 'DD'), "); sql.append(" r.indsentidoida, "); sql.append(" da.cantasientos, "); - sql.append(" to_char(b.fechorviaje, 'HH24:mi'), "); + sql.append(" to_char(ec.horasalida, 'HH24:mi'), "); sql.append(" b.corrida_id, "); sql.append(" e.codder, "); sql.append(" cs.descclase ");