From 14d80dda7d3b070f31cf740ab677d3628c4e85c5 Mon Sep 17 00:00:00 2001 From: julio Date: Thu, 6 Feb 2014 19:50:05 +0000 Subject: [PATCH] =?UTF-8?q?0004807:=20RAE=20-=20Ajuste=20de=20RElat=C3=B3r?= =?UTF-8?q?io?= 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@33484 d1611594-4594-4d17-8e1d-87c2c4800839 --- .../RelatorioAcompanhamentoEquivalentes.java | 30 +- ...RelatorioAcompanhamentoEquivalentes.jasper | Bin 99316 -> 99868 bytes .../RelatorioAcompanhamentoEquivalentes.jrxml | 308 +++++++++--------- src/java/versionADM.info | 2 +- 4 files changed, 174 insertions(+), 166 deletions(-) diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioAcompanhamentoEquivalentes.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioAcompanhamentoEquivalentes.java index b715be2b2..9c997fe79 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioAcompanhamentoEquivalentes.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioAcompanhamentoEquivalentes.java @@ -166,7 +166,7 @@ public class RelatorioAcompanhamentoEquivalentes extends Relatorio { break; } - return getValorIndicador(data, corridaId, indicador, assentos, sql); + return getValorIndicador(data, corridaId, rolOperativoId, indicador, assentos, sql); } }); @@ -178,6 +178,7 @@ public class RelatorioAcompanhamentoEquivalentes extends Relatorio { sql.append(" FROM CORRIDA CR, TRAMO TR, TARIFA TF, VIGENCIA_TARIFA VT"); sql.append(" WHERE CR.CORRIDA_ID = :CORRIDA_ID"); sql.append(" AND CR.FECCORRIDA = :FECCORRIDA"); + sql.append(" AND CR.ROLOPERATIVO_ID = :ROLOPERATIVO_ID"); sql.append(" AND TF.CLASESERVICIO_ID = CR.CLASESERVICIO_ID"); sql.append(" AND TF.MARCA_ID = CR.MARCA_ID"); sql.append(" AND TF.RUTA_ID = CR.RUTA_ID"); @@ -196,7 +197,6 @@ public class RelatorioAcompanhamentoEquivalentes extends Relatorio { sql.append(" WHERE BO.CORRIDA_ID = :CORRIDA_ID"); sql.append(" AND BO.FECCORRIDA = :FECCORRIDA"); sql.append(" AND BO.ACTIVO = 1"); - sql.append(" AND BO.INDREIMPRESION = 0"); sql.append(" AND BO.INDSTATUSOPERACION = 'F'"); sql.append(" AND (BO.MOTIVOCANCELACION_ID IS NULL OR"); sql.append(" BO.MOTIVOCANCELACION_ID = 0)),"); @@ -221,6 +221,7 @@ public class RelatorioAcompanhamentoEquivalentes extends Relatorio { sql.append(" CORRIDA_TRAMO CTO"); sql.append(" WHERE CR.CORRIDA_ID = :CORRIDA_ID"); sql.append(" AND CR.FECCORRIDA = :FECCORRIDA"); + sql.append(" AND CR.ROLOPERATIVO_ID = :ROLOPERATIVO_ID"); sql.append(" AND CT.FECCORRIDA = CR.FECCORRIDA"); sql.append(" AND CT.CORRIDA_ID = CR.CORRIDA_ID"); sql.append(" AND TR.TRAMO_ID = CT.TRAMO_ID"); @@ -237,7 +238,6 @@ public class RelatorioAcompanhamentoEquivalentes extends Relatorio { sql.append(" AND CT.NUMSECUENCIA BETWEEN CTO.NUMSECUENCIA AND"); sql.append(" CTD.NUMSECUENCIA"); sql.append(" AND BO.ACTIVO = 1"); - sql.append(" AND BO.INDREIMPRESION = 0"); sql.append(" AND BO.INDSTATUSOPERACION = 'F'"); sql.append(" AND (BO.MOTIVOCANCELACION_ID IS NULL OR"); sql.append(" BO.MOTIVOCANCELACION_ID = 0)"); @@ -288,17 +288,23 @@ public class RelatorioAcompanhamentoEquivalentes extends Relatorio { protected String getSqlIndicadorReceitaKm() { StringBuilder sql = new StringBuilder(); sql.append(" SELECT (RECEITA / (SELECT SUM(TR1.CANTKMREAL) "); - sql.append(" FROM CORRIDA_TRAMO CT1, TRAMO TR1 "); + sql.append(" FROM CORRIDA_TRAMO CT1 "); + sql.append(" RIGHT JOIN CORRIDA CR ON "); + sql.append(" (CR.CORRIDA_ID = CT1.CORRIDA_ID AND CR.FECCORRIDA = CT1.FECCORRIDA), "); + sql.append(" TRAMO TR1 "); sql.append(" WHERE CT1.CORRIDA_ID = :CORRIDA_ID "); sql.append(" AND CT1.FECCORRIDA = :FECCORRIDA "); + sql.append(" AND CR.ROLOPERATIVO_ID = :ROLOPERATIVO_ID "); sql.append(" AND TR1.TRAMO_ID = CT1.TRAMO_ID)) VALOR "); sql.append(" FROM (SELECT SUM(BO.PRECIOPAGADO + BO.IMPORTEPEDAGIO + BO.IMPORTESEGURO + "); sql.append(" BO.IMPORTETAXAEMBARQUE) RECEITA "); sql.append(" FROM BOLETO BO "); + sql.append(" RIGHT JOIN CORRIDA CR ON "); + sql.append(" (CR.CORRIDA_ID = BO.CORRIDA_ID AND CR.FECCORRIDA = BO.FECCORRIDA) "); sql.append(" WHERE BO.CORRIDA_ID = :CORRIDA_ID "); sql.append(" AND BO.FECCORRIDA = :FECCORRIDA "); + sql.append(" AND CR.ROLOPERATIVO_ID = :ROLOPERATIVO_ID "); sql.append(" AND BO.ACTIVO = 1 "); - sql.append(" AND BO.INDREIMPRESION = 0 "); sql.append(" AND BO.INDSTATUSOPERACION = 'F' "); sql.append(" AND (BO.MOTIVOCANCELACION_ID IS NULL OR "); sql.append(" BO.MOTIVOCANCELACION_ID = 0)) RC "); @@ -313,10 +319,12 @@ public class RelatorioAcompanhamentoEquivalentes extends Relatorio { sql.append("SELECT SUM(BO.PRECIOPAGADO + BO.IMPORTEPEDAGIO + BO.IMPORTESEGURO + "); sql.append(" BO.IMPORTETAXAEMBARQUE) VALOR "); sql.append(" FROM BOLETO BO "); + sql.append(" RIGHT JOIN CORRIDA CR ON "); + sql.append(" (CR.CORRIDA_ID = BO.CORRIDA_ID AND CR.FECCORRIDA = BO.FECCORRIDA) "); sql.append(" WHERE BO.CORRIDA_ID = :CORRIDA_ID "); sql.append(" AND BO.FECCORRIDA = :FECCORRIDA "); + sql.append(" AND CR.ROLOPERATIVO_ID = :ROLOPERATIVO_ID "); sql.append(" AND BO.ACTIVO = 1 "); - sql.append(" AND BO.INDREIMPRESION = 0 "); sql.append(" AND BO.INDSTATUSOPERACION = 'F' "); sql.append(" AND (BO.MOTIVOCANCELACION_ID IS NULL OR "); sql.append(" BO.MOTIVOCANCELACION_ID = 0) "); @@ -342,6 +350,7 @@ public class RelatorioAcompanhamentoEquivalentes extends Relatorio { sql.append(" AND TR1.TRAMO_ID = CT1.TRAMO_ID) EL "); sql.append(" WHERE CR.CORRIDA_ID = :CORRIDA_ID "); sql.append(" AND CR.FECCORRIDA = :FECCORRIDA "); + sql.append(" AND CR.ROLOPERATIVO_ID = :ROLOPERATIVO_ID "); sql.append(" AND CT.FECCORRIDA = CR.FECCORRIDA "); sql.append(" AND CT.CORRIDA_ID = CR.CORRIDA_ID "); sql.append(" AND TR.TRAMO_ID = CT.TRAMO_ID "); @@ -357,7 +366,6 @@ public class RelatorioAcompanhamentoEquivalentes extends Relatorio { sql.append(" AND CTD.ACTIVO = 1 "); sql.append(" AND CT.NUMSECUENCIA BETWEEN CTO.NUMSECUENCIA AND CTD.NUMSECUENCIA "); sql.append(" AND BO.ACTIVO = 1 "); - sql.append(" AND BO.INDREIMPRESION = 0 "); sql.append(" AND BO.INDSTATUSOPERACION = 'F' "); sql.append(" AND (BO.MOTIVOCANCELACION_ID IS NULL OR BO.MOTIVOCANCELACION_ID = 0) "); sql.append(" GROUP BY CT.TRAMO_ID, TR.CANTKMREAL, EL.EXTENSAO_LINHA "); @@ -372,18 +380,20 @@ public class RelatorioAcompanhamentoEquivalentes extends Relatorio { sql.append(" SELECT SUM(1) AS VALOR"); sql.append(" FROM BOLETO BO "); + sql.append(" RIGHT JOIN CORRIDA CR ON "); + sql.append(" (CR.CORRIDA_ID = BO.CORRIDA_ID AND CR.FECCORRIDA = BO.FECCORRIDA) "); sql.append(" WHERE BO.INDSTATUSOPERACION = 'F' "); sql.append(" AND BO.ACTIVO = 1 "); sql.append(" AND (BO.MOTIVOCANCELACION_ID IS NULL OR BO.MOTIVOCANCELACION_ID = 0) "); - sql.append(" AND BO.INDREIMPRESION = 0 "); sql.append(" AND BO.CORRIDA_ID = :CORRIDA_ID "); sql.append(" AND BO.FECCORRIDA = :FECCORRIDA "); + sql.append(" AND CR.ROLOPERATIVO_ID = :ROLOPERATIVO_ID "); return sql.toString(); } - protected BigDecimal getValorIndicador(Date data, Integer corridaId, Integer indicador, Integer assentos, String sql) throws SQLException { + protected BigDecimal getValorIndicador(Date data, Integer corridaId, Integer rolOperativoId, Integer indicador, Integer assentos, String sql) throws SQLException { BigDecimal retorno = null; try { @@ -398,6 +408,8 @@ public class RelatorioAcompanhamentoEquivalentes extends Relatorio { stmt.setInt("CAPACIDADE", assentos); stmt.setInt("CEM", CEM); stmt.setInt("MAX_DECIMAL", MAX_DECIMAL); + } else { + stmt.setInt("ROLOPERATIVO_ID", rolOperativoId); } ResultSet resultSet = stmt.executeQuery(); diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioAcompanhamentoEquivalentes.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioAcompanhamentoEquivalentes.jasper index 3029c8636b5a9f391613dc9a6476acb1fa497ef4..9cf2e74519732ed160cace9cf161a8c70673cdf0 100644 GIT binary patch delta 8944 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 delta 8168 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 diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioAcompanhamentoEquivalentes.jrxml b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioAcompanhamentoEquivalentes.jrxml index 801968346..09868e9d8 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioAcompanhamentoEquivalentes.jrxml +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioAcompanhamentoEquivalentes.jrxml @@ -1,8 +1,8 @@ - - + +