From df44d513bb2ee134c9c2e020cc86db482ce97871 Mon Sep 17 00:00:00 2001 From: emerson Date: Wed, 15 Aug 2018 13:01:36 +0000 Subject: [PATCH] fixes bug#0011329 dev: emerson qua: jose git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@84266 d1611594-4594-4d17-8e1d-87c2c4800839 --- .../relatorios/impl/RelatorioEmpresaCorrida.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioEmpresaCorrida.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioEmpresaCorrida.java index 4d42b1c06..3dabcc8d6 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioEmpresaCorrida.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioEmpresaCorrida.java @@ -159,13 +159,13 @@ public class RelatorioEmpresaCorrida extends Relatorio { sql.append(" COALESCE(SUM(CANTKMREAL),0) KMTOTAL, "); sql.append(" COALESCE(SUM( "); sql.append(" CASE "); - sql.append(" WHEN EMPRESA_ID = EMPRESACORRIDA_ID THEN CANTKMREAL "); + sql.append(" WHEN EMPRESA_ID_AUTOBUS = EMPRESACORRIDA_ID THEN CANTKMREAL "); sql.append(" ELSE 0 "); sql.append(" END "); sql.append(" ),0) KMONIBUSPROPRIO, "); sql.append(" COALESCE(SUM( "); sql.append(" CASE "); - sql.append(" WHEN EMPRESA_ID <> EMPRESACORRIDA_ID THEN CANTKMREAL "); + sql.append(" WHEN EMPRESA_ID_AUTOBUS <> EMPRESACORRIDA_ID THEN CANTKMREAL "); sql.append(" ELSE 0 "); sql.append(" END "); sql.append(" ),0) KMONIBUSARRENDADOS "); @@ -205,7 +205,8 @@ public class RelatorioEmpresaCorrida extends Relatorio { sql.append(" PD.DESCPARADA DESTINO, "); sql.append(" C.CORRIDA_ID, "); sql.append(" T.CANTKMREAL, "); - sql.append(" C.EMPRESACORRIDA_ID "); + sql.append(" C.EMPRESACORRIDA_ID, "); + sql.append(" A.EMPRESA_ID EMPRESA_ID_AUTOBUS "); sql.append(" FROM CORRIDA C "); sql.append(" INNER JOIN RUTA R ON C.RUTA_ID = R.RUTA_ID "); sql.append(" INNER JOIN CORRIDA_TRAMO CT ON CT.CORRIDA_ID = C.CORRIDA_ID ");