From 6bda4ddd3e87abd7bc35214542f29d04f4372282 Mon Sep 17 00:00:00 2001 From: julio Date: Fri, 15 May 2015 21:34:57 +0000 Subject: [PATCH] =?UTF-8?q?Diverg=C3=AAncia=20Relat=C3=B3rio=20Empresa=20?= =?UTF-8?q?=C3=B4nibus=20x=20Empresa=20Corrida=20(fixes=20bug=20#6270)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@44072 d1611594-4594-4d17-8e1d-87c2c4800839 --- .../relatorios/impl/RelatorioEmpresaCorrida.java | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioEmpresaCorrida.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioEmpresaCorrida.java index 71d98b06e..7a5153a73 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioEmpresaCorrida.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioEmpresaCorrida.java @@ -36,6 +36,7 @@ public class RelatorioEmpresaCorrida extends Relatorio { String empresa = parametros.get("empresa") != null ? parametros.get("empresa").toString() : ""; String sql = getSql(empresa); + System.out.println(sql); NamedParameterStatement stmt = new NamedParameterStatement(conexao, sql); ResultSet rset = null; @@ -110,18 +111,18 @@ public class RelatorioEmpresaCorrida extends Relatorio { sql.append(" INNER JOIN parada d ON d.parada_id = ct.destino_id "); sql.append(" INNER JOIN autobus a ON a.autobus_id = ct.autobus_id "); sql.append(" INNER JOIN empresa e ON e.empresa_id = a.empresa_id "); - sql.append(" WHERE c.activo <> 0 "); - sql.append(" AND ct.activo = 1 "); + sql.append(" WHERE c.activo <> 0 AND ct.activo = 1 "); sql.append(StringUtils.isBlank(empresa) ? "" : "AND c.empresacorrida_id = :empresa_id "); sql.append(" AND c.FECCORRIDA BETWEEN :fecInicio AND :fecFinal "); - sql.append(" GROUP BY c.ruta_id) km2 ON r.ruta_id = km2.ruta_id "); - sql.append("INNER JOIN corrida c ON c.ruta_id = re.ruta_id "); + sql.append(" GROUP BY c.ruta_id ) km2 ON re.ruta_id = km2.ruta_id "); + sql.append("LEFT JOIN corrida c ON c.ruta_id = re.ruta_id "); sql.append("LEFT JOIN boleto b ON b.corrida_id = c.corrida_id AND b.feccorrida = c.feccorrida "); sql.append("LEFT OUTER JOIN categoria cat ON cat.categoria_id = b.categoria_id "); sql.append("WHERE c.activo <> 0 "); + sql.append("AND r.activo = 1 "); + sql.append("AND re.activo = 1 "); sql.append(StringUtils.isBlank(empresa) ? "" : "AND re.empresa_id = :empresa_id "); - sql.append("AND c.ruta_id = km2.ruta_id "); - sql.append("AND b.FECCORRIDA BETWEEN :fecInicio AND :fecFinal "); + sql.append("AND c.FECCORRIDA BETWEEN :fecInicio AND :fecFinal "); sql.append("GROUP BY "); sql.append(" e.empresa_id, "); sql.append(" e.nombempresa, "); @@ -130,7 +131,7 @@ public class RelatorioEmpresaCorrida extends Relatorio { sql.append(" km2.kmtotal, "); sql.append(" km2.kmonibusproprio, "); sql.append(" km2.kmonibusarrendados "); - sql.append("ORDER BY r.descruta "); +// sql.append("ORDER BY r.descruta"); return sql.toString(); }