From a02be6491d49892d596bb383ceb80c0649caa0eb Mon Sep 17 00:00:00 2001 From: leonardo Date: Tue, 19 Aug 2014 18:11:35 +0000 Subject: [PATCH] =?UTF-8?q?Relat=C3=B3rio=20Empresa=20Corrida=20(fixed=20b?= =?UTF-8?q?ug=20#5597)?= 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@37404 d1611594-4594-4d17-8e1d-87c2c4800839 --- .../relatorios/impl/RelatorioEmpresaCorrida.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioEmpresaCorrida.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioEmpresaCorrida.java index a66bb4c94..13a046516 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioEmpresaCorrida.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioEmpresaCorrida.java @@ -88,21 +88,21 @@ public class RelatorioEmpresaCorrida extends Relatorio { sql.append(" r.descruta AS linea, "); sql.append(" nombempresa, "); sql.append(" COALESCE(Sum(CASE "); - sql.append(" WHEN b.motivocancelacion_id IS NULL THEN "); + sql.append(" WHEN ((b.motivocancelacion_id is null) AND (cat.grupocategoria_id is null OR cat.grupocategoria_id <> 4)) THEN "); sql.append(" b.preciopagado "); sql.append(" ELSE 0 "); sql.append(" END), 0) boletos, "); sql.append(" COALESCE(Sum(CASE "); - sql.append(" WHEN b.motivocancelacion_id IS NOT NULL "); - sql.append(" AND b.indstatusboleto = 'C' THEN "); + sql.append(" WHEN b.motivocancelacion_id is null AND cat.grupocategoria_id = 4 THEN "); sql.append(" b.preciopagado "); sql.append(" ELSE 0 "); sql.append(" END), 0) abonos, "); - sql.append(" COALESCE(Count(b.boleto_id), 0) passageirosTransp, "); + sql.append(" COALESCE(SUM(CASE WHEN b.motivocancelacion_id is null THEN 1 ELSE 0 END), 0) passageirosTransp, "); sql.append(" COALESCE(km2.kmtotal, 0) kmtotal, "); sql.append(" COALESCE(km2.kmonibusproprio, 0) kmOnibusProprio, "); sql.append(" COALESCE(km2.kmonibusarrendados, 0) kmOnibusArrendados "); sql.append("FROM boleto b "); + sql.append(" INNER JOIN categoria cat on cat.categoria_id = b.categoria_id "); sql.append(" INNER JOIN marca m "); sql.append(" ON m.marca_id = b.marca_id "); sql.append(" INNER JOIN empresa e ");