From 5e2f5a262041efbc2a25d2a9f1bb243be7e2bc55 Mon Sep 17 00:00:00 2001 From: fabio Date: Fri, 10 Jul 2020 14:08:09 +0000 Subject: [PATCH] fixes bug#19617 dev: Thiago Clemente qua: git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@102381 d1611594-4594-4d17-8e1d-87c2c4800839 --- .../ventaboletos/relatorios/impl/RelatorioMmphDer.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioMmphDer.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioMmphDer.java index 9112653d0..a915bb5e4 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioMmphDer.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioMmphDer.java @@ -48,6 +48,7 @@ public class RelatorioMmphDer extends Relatorio { 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(" e.codder, "); sql.append(" sum(CASE "); sql.append(" WHEN co.tiposervicio_id = 2 THEN 1 ELSE 0 "); sql.append(" END) AS extra "); @@ -62,6 +63,9 @@ public class RelatorioMmphDer extends Relatorio { sql.append(" inner join MARCA m "); sql.append(" on m.marca_id = b.marca_id "); sql.append(" and m.activo = 1 "); + sql.append(" INNER JOIN empresa e "); + sql.append(" on m.empresa_id = e.empresa_id "); + sql.append(" and e.activo = 1 "); sql.append(" left join rol_operativo ro "); sql.append(" on ro.roloperativo_id = co.roloperativo_id "); sql.append(" left join diagrama_autobus da "); @@ -95,6 +99,7 @@ public class RelatorioMmphDer extends Relatorio { sql.append(" da.cantasientos, "); sql.append(" to_char(b.fechorviaje, 'HH24:mi'), "); sql.append(" b.corrida_id, "); + sql.append(" e.codder, "); sql.append(" cs.descclase "); sql.append(" ) "); @@ -239,7 +244,8 @@ public class RelatorioMmphDer extends Relatorio { dataResult.put("SERVICO", rset.getString("servico")); dataResult.put("HORARIO", rset.getString("horario")); dataResult.put("ASSENTOS", limpaNulo(rset.getBigDecimal("assentos"))); - dataResult.put("CLASSE", rset.getString("classe")); + dataResult.put("CLASSE", rset.getString("classe")); + dataResult.put("CODDER", rset.getString("codder")); dataResult.put("TOTEXTRA", rset.getInt("extra")); dataResult.put("TOTDIASUTEISIDA", totDiasUteisIda);