From ca28e6eefdb360788adba49f11d64c746c99a028 Mon Sep 17 00:00:00 2001
From: rodrigo <rodrigo@d1611594-4594-4d17-8e1d-87c2c4800839>
Date: Mon, 26 Aug 2013 21:49:14 +0000
Subject: [PATCH] git-svn-id:
 http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@30083
 d1611594-4594-4d17-8e1d-87c2c4800839

---
 .../impl/RelatorioOrigemDestino.java          | 452 ++++++++++++++----
 .../relatorios/impl/RelatorioTaxasLinha.java  |  14 +-
 .../templates/RelatorioOrigemDestino.jasper   | Bin 72105 -> 72141 bytes
 .../templates/RelatorioOrigemDestino.jrxml    |  10 +-
 4 files changed, 370 insertions(+), 106 deletions(-)

diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioOrigemDestino.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioOrigemDestino.java
index d9c943afc..0fe1068dc 100644
--- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioOrigemDestino.java
+++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioOrigemDestino.java
@@ -240,103 +240,365 @@ public class RelatorioOrigemDestino extends Relatorio {
 			Boolean bilhetesGratuitos, Boolean trechosSemMovimento) {
 
 		StringBuilder sql = new StringBuilder();
-		sql.append("	SELECT ");
-		sql.append("	    resultado.*, ");
-		sql.append("	    ( ");
-		sql.append("	        SELECT COUNT(*) ");
-		sql.append("	        FROM CORRIDA CO ");
-		sql.append("	        WHERE CO.CORRIDA_ID=RESULTADO.CORRIDA_ID ");
-		sql.append("		        AND CO.FECCORRIDA BETWEEN to_date('").append(dataDe).append("','dd/mm/yyyy HH24:mi:ss') AND to_date('").append(dataAte).append("','dd/mm/yyyy HH24:mi:ss') ");
-		sql.append("	    ) VIAGENS, ");
-		sql.append("	    SUM(TR.CANTKMREAL) KM_CORRIDA, ");
-		sql.append("	   ( ");
-		sql.append("	        SELECT MAX(DA.CANTASIENTOS) ");
-		sql.append("	        FROM CORRIDA CO ");
-		sql.append("	            INNER JOIN ROL_OPERATIVO ROL ON ROL.ROLOPERATIVO_ID=CO.ROLOPERATIVO_ID ");
-		sql.append("	            INNER JOIN DIAGRAMA_AUTOBUS DA ON DA.DIAGRAMAAUTOBUS_ID = ROL.DIAGRAMAAUTOBUS_ID ");
-		sql.append("	        WHERE CO.CORRIDA_ID=RESULTADO.CORRIDA_ID ");
-		sql.append("		        AND CO.FECCORRIDA BETWEEN to_date('").append(dataDe).append("','dd/mm/yyyy HH24:mi:ss') AND to_date('").append(dataAte).append("','dd/mm/yyyy HH24:mi:ss') ");
-		sql.append("	        GROUP BY CO.CORRIDA_ID ");
-		sql.append("	    ) DISPONIBILIDADE, ");
-		sql.append("	    ( SELECT  COUNT(*) ");
-		sql.append("	      FROM BOLETO ca ");
-		sql.append("	            INNER JOIN CORRIDA CO ON (CO.CORRIDA_ID = CA.CORRIDA_ID AND CO.FECCORRIDA = CA.FECCORRIDA) ");
-		sql.append("	      WHERE CA.ACTIVO = 1 ");
-		sql.append("		        AND CO.EMPRESACORRIDA_ID IN (").append(empresaIds).append(") ");
-		sql.append("                AND CA.CORRIDA_ID = RESULTADO.CORRIDA_ID ");
-		sql.append("		        AND CA.FECCORRIDA BETWEEN to_date('").append(dataDe).append("','dd/mm/yyyy HH24:mi:ss') AND to_date('").append(dataAte).append("','dd/mm/yyyy HH24:mi:ss') ");
-		sql.append("	            AND CA.MOTIVOCANCELACION_ID IS NULL ");
-		sql.append("	            AND CA.PRECIOBASE IS NOT NULL ");
-		if (bilhetesGratuitos) {
-			sql.append("            AND CA.PRECIOBASE >= 0 ");
-		} else {
-			sql.append("            AND CA.PRECIOBASE > 0 ");
-		}
-		sql.append("	     ) ABSOLUTO_TOTAL_CORRIDA, ");
-		sql.append("        (RESULTADO.KM_TRAMO/SUM(TR.CANTKMREAL))*");
-		sql.append("	    ( SELECT  COUNT(*) ");
-		sql.append("	      FROM BOLETO ca ");
-		sql.append("	            INNER JOIN CORRIDA CO ON (CO.CORRIDA_ID = CA.CORRIDA_ID AND CO.FECCORRIDA = CA.FECCORRIDA) ");
-		sql.append("	      WHERE CA.ACTIVO = 1 ");
-		sql.append("		        AND CO.EMPRESACORRIDA_ID IN (").append(empresaIds).append(") ");
-		sql.append("                AND CA.CORRIDA_ID = RESULTADO.CORRIDA_ID ");
-		sql.append("		        AND CA.FECCORRIDA BETWEEN to_date('").append(dataDe).append("','dd/mm/yyyy HH24:mi:ss') AND to_date('").append(dataAte).append("','dd/mm/yyyy HH24:mi:ss') ");
-		sql.append("	            AND CA.MOTIVOCANCELACION_ID IS NULL ");
-		sql.append("	            AND CA.PRECIOBASE IS NOT NULL ");
-		if (bilhetesGratuitos) {
-			sql.append("            AND CA.PRECIOBASE >= 0 ");
-		} else {
-			sql.append("            AND CA.PRECIOBASE > 0 ");
-		}
-		sql.append("	     ) EQUIVALENTE_TOTAL_CORRIDA ");
+//		sql.append("	SELECT ");
+//		sql.append("	    resultado.*, ");
+//		sql.append("	    ( ");
+//		sql.append("	        SELECT COUNT(*) ");
+//		sql.append("	        FROM CORRIDA CO ");
+//		sql.append("	        WHERE CO.CORRIDA_ID=RESULTADO.CORRIDA_ID ");
+//		sql.append("		        AND CO.FECCORRIDA BETWEEN to_date('").append(dataDe).append("','dd/mm/yyyy HH24:mi:ss') AND to_date('").append(dataAte).append("','dd/mm/yyyy HH24:mi:ss') ");
+//		sql.append("	    ) VIAGENS, ");
+//		sql.append("	    SUM(TR.CANTKMREAL) KM_CORRIDA, ");
+//		sql.append("	   ( ");
+//		sql.append("	        SELECT MAX(DA.CANTASIENTOS) ");
+//		sql.append("	        FROM CORRIDA CO ");
+//		sql.append("	            INNER JOIN ROL_OPERATIVO ROL ON ROL.ROLOPERATIVO_ID=CO.ROLOPERATIVO_ID ");
+//		sql.append("	            INNER JOIN DIAGRAMA_AUTOBUS DA ON DA.DIAGRAMAAUTOBUS_ID = ROL.DIAGRAMAAUTOBUS_ID ");
+//		sql.append("	        WHERE CO.CORRIDA_ID=RESULTADO.CORRIDA_ID ");
+//		sql.append("		        AND CO.FECCORRIDA BETWEEN to_date('").append(dataDe).append("','dd/mm/yyyy HH24:mi:ss') AND to_date('").append(dataAte).append("','dd/mm/yyyy HH24:mi:ss') ");
+//		sql.append("	        GROUP BY CO.CORRIDA_ID ");
+//		sql.append("	    ) DISPONIBILIDADE, ");
+//		sql.append("	    ( SELECT  COUNT(*) ");
+//		sql.append("	      FROM BOLETO ca ");
+//		sql.append("	            INNER JOIN CORRIDA CO ON (CO.CORRIDA_ID = CA.CORRIDA_ID AND CO.FECCORRIDA = CA.FECCORRIDA) ");
+//		sql.append("	      WHERE CA.ACTIVO = 1 ");
+//		sql.append("		        AND CO.EMPRESACORRIDA_ID IN (").append(empresaIds).append(") ");
+//		sql.append("                AND CA.CORRIDA_ID = RESULTADO.CORRIDA_ID ");
+//		sql.append("		        AND CA.FECCORRIDA BETWEEN to_date('").append(dataDe).append("','dd/mm/yyyy HH24:mi:ss') AND to_date('").append(dataAte).append("','dd/mm/yyyy HH24:mi:ss') ");
+//		sql.append("	            AND CA.MOTIVOCANCELACION_ID IS NULL ");
+//		sql.append("	            AND CA.PRECIOBASE IS NOT NULL ");
+//		if (bilhetesGratuitos) {
+//			sql.append("            AND CA.PRECIOBASE >= 0 ");
+//		} else {
+//			sql.append("            AND CA.PRECIOBASE > 0 ");
+//		}
+//		sql.append("	     ) ABSOLUTO_TOTAL_CORRIDA, ");
+//		sql.append("        (RESULTADO.KM_TRAMO/SUM(TR.CANTKMREAL))*");
+//		sql.append("	    ( SELECT  COUNT(*) ");
+//		sql.append("	      FROM BOLETO ca ");
+//		sql.append("	            INNER JOIN CORRIDA CO ON (CO.CORRIDA_ID = CA.CORRIDA_ID AND CO.FECCORRIDA = CA.FECCORRIDA) ");
+//		sql.append("	      WHERE CA.ACTIVO = 1 ");
+//		sql.append("		        AND CO.EMPRESACORRIDA_ID IN (").append(empresaIds).append(") ");
+//		sql.append("                AND CA.CORRIDA_ID = RESULTADO.CORRIDA_ID ");
+//		sql.append("		        AND CA.FECCORRIDA BETWEEN to_date('").append(dataDe).append("','dd/mm/yyyy HH24:mi:ss') AND to_date('").append(dataAte).append("','dd/mm/yyyy HH24:mi:ss') ");
+//		sql.append("	            AND CA.MOTIVOCANCELACION_ID IS NULL ");
+//		sql.append("	            AND CA.PRECIOBASE IS NOT NULL ");
+//		if (bilhetesGratuitos) {
+//			sql.append("            AND CA.PRECIOBASE >= 0 ");
+//		} else {
+//			sql.append("            AND CA.PRECIOBASE > 0 ");
+//		}
+//		sql.append("	     ) EQUIVALENTE_TOTAL_CORRIDA ");
+//
+//		sql.append("	FROM ");
+//		sql.append("	    ( ");
+//		sql.append("	        SELECT ");
+//		sql.append("	            EM.NOMBEMPRESA, ");
+//		sql.append("	            CO.CORRIDA_ID CORRIDA_ID, ");
+//		sql.append("	            MAX(CO.FECHORSALIDA) FECHORSALIDA, ");
+//		sql.append("	            ORI.CVEPARADA ORIGEM, ");
+//		sql.append("	            DES.CVEPARADA DESTINO, ");
+//		sql.append("	            CA.NUMKMVIAJE KM_TRAMO, ");
+//		sql.append("	            RU.RUTA_ID, ");
+//		sql.append("	            RU.DESCRUTA, ");
+//		sql.append("	            RU.INDSENTIDOIDA, ");
+//		sql.append("	            COUNT(*) ABSOLUTOS, ");
+//		sql.append("	            SUM(CA.PRECIOPAGADO) RECEITA, ");
+//		sql.append("	            CA.PRECIOBASE ");
+//		sql.append("	        FROM BOLETO CA ");
+//		sql.append("	        INNER JOIN PARADA ORI ON ORI.PARADA_ID = CA.ORIGEN_ID ");
+//		sql.append("	        INNER JOIN PARADA DES ON DES.PARADA_ID = CA.DESTINO_ID ");
+//		sql.append("	        INNER JOIN CORRIDA CO ON (CO.CORRIDA_ID = CA.CORRIDA_ID AND CO.FECCORRIDA = CA.FECCORRIDA) ");
+//		sql.append("	        INNER JOIN EMPRESA EM ON EM.EMPRESA_ID = CO.EMPRESACORRIDA_ID ");
+//		sql.append("	        INNER JOIN RUTA RU ON RU.RUTA_ID = CO.RUTA_ID ");
+//		sql.append("	        WHERE CA.ACTIVO = 1 ");
+//		sql.append("	        AND RU.ACTIVO = 1 ");
+//		sql.append("	        AND EM.ACTIVO = 1 ");
+//		sql.append("	        AND ORI.ACTIVO = 1 ");
+//		sql.append("	        AND DES.ACTIVO = 1 ");
+//		sql.append("		    AND CO.EMPRESACORRIDA_ID IN (").append(empresaIds).append(") ");
+//		if (!corridasIds.equals("Todas")) {
+//			sql.append("	    AND CA.CORRIDA_ID IN (").append(corridasIds).append(") ");
+//		}
+//		sql.append("		    AND CA.FECCORRIDA BETWEEN to_date('").append(dataDe).append("','dd/mm/yyyy HH24:mi:ss') AND to_date('").append(dataAte).append("','dd/mm/yyyy HH24:mi:ss') ");
+//		sql.append("	        AND CA.MOTIVOCANCELACION_ID IS NULL ");
+//		sql.append("	        AND CA.PRECIOBASE IS NOT NULL ");
+//		if (bilhetesGratuitos) {
+//			sql.append("        AND CA.PRECIOBASE >= 0 ");
+//		} else {
+//			sql.append("        AND CA.PRECIOBASE > 0 ");
+//		}
+//		sql.append("	        GROUP BY RU.RUTA_ID, EM.NOMBEMPRESA, ORI.CVEPARADA, DES.CVEPARADA, CA.NUMKMVIAJE, CO.CORRIDA_ID, RU.DESCRUTA, RU.INDSENTIDOIDA, CA.PRECIOBASE ");
+//		sql.append("	    ) resultado ");
+//		sql.append("	INNER JOIN RUTA_SECUENCIA RS ON RS.RUTA_ID = resultado.RUTA_ID ");
+//		sql.append("	INNER JOIN TRAMO TR ON TR.TRAMO_ID = RS.TRAMO_ID ");
+//		sql.append("	WHERE RS.ACTIVO = 1 ");
+//		sql.append("	AND TR.ACTIVO = 1 ");
+//		sql.append("	GROUP BY resultado.NOMBEMPRESA, resultado.CORRIDA_ID, resultado.FECHORSALIDA, resultado.ORIGEM, resultado.DESTINO, resultado.KM_TRAMO, resultado.RUTA_ID, resultado.DESCRUTA, resultado.INDSENTIDOIDA, resultado.ABSOLUTOS, resultado.RECEITA, resultado.PRECIOBASE ");
+//		sql.append("    ORDER BY resultado.CORRIDA_ID ");
 
-		sql.append("	FROM ");
-		sql.append("	    ( ");
-		sql.append("	        SELECT ");
-		sql.append("	            EM.NOMBEMPRESA, ");
-		sql.append("	            CO.CORRIDA_ID CORRIDA_ID, ");
-		sql.append("	            MAX(CO.FECHORSALIDA) FECHORSALIDA, ");
-		sql.append("	            ORI.CVEPARADA ORIGEM, ");
-		sql.append("	            DES.CVEPARADA DESTINO, ");
-		sql.append("	            CA.NUMKMVIAJE KM_TRAMO, ");
-		sql.append("	            RU.RUTA_ID, ");
-		sql.append("	            RU.DESCRUTA, ");
-		sql.append("	            RU.INDSENTIDOIDA, ");
-		sql.append("	            COUNT(*) ABSOLUTOS, ");
-		sql.append("	            SUM(CA.PRECIOPAGADO) RECEITA, ");
-		sql.append("	            CA.PRECIOBASE ");
-		sql.append("	        FROM BOLETO CA ");
-		sql.append("	        INNER JOIN PARADA ORI ON ORI.PARADA_ID = CA.ORIGEN_ID ");
-		sql.append("	        INNER JOIN PARADA DES ON DES.PARADA_ID = CA.DESTINO_ID ");
-		sql.append("	        INNER JOIN CORRIDA CO ON (CO.CORRIDA_ID = CA.CORRIDA_ID AND CO.FECCORRIDA = CA.FECCORRIDA) ");
-		sql.append("	        INNER JOIN EMPRESA EM ON EM.EMPRESA_ID = CO.EMPRESACORRIDA_ID ");
-		sql.append("	        INNER JOIN RUTA RU ON RU.RUTA_ID = CO.RUTA_ID ");
-		sql.append("	        WHERE CA.ACTIVO = 1 ");
-		sql.append("	        AND RU.ACTIVO = 1 ");
-		sql.append("	        AND EM.ACTIVO = 1 ");
-		sql.append("	        AND ORI.ACTIVO = 1 ");
-		sql.append("	        AND DES.ACTIVO = 1 ");
-		sql.append("		    AND CO.EMPRESACORRIDA_ID IN (").append(empresaIds).append(") ");
-		if (!corridasIds.equals("Todas")) {
-			sql.append("	    AND CA.CORRIDA_ID IN (").append(corridasIds).append(") ");
-		}
-		sql.append("		    AND CA.FECCORRIDA BETWEEN to_date('").append(dataDe).append("','dd/mm/yyyy HH24:mi:ss') AND to_date('").append(dataAte).append("','dd/mm/yyyy HH24:mi:ss') ");
-		sql.append("	        AND CA.MOTIVOCANCELACION_ID IS NULL ");
-		sql.append("	        AND CA.PRECIOBASE IS NOT NULL ");
-		if (bilhetesGratuitos) {
-			sql.append("        AND CA.PRECIOBASE >= 0 ");
-		} else {
-			sql.append("        AND CA.PRECIOBASE > 0 ");
-		}
-		sql.append("	        GROUP BY RU.RUTA_ID, EM.NOMBEMPRESA, ORI.CVEPARADA, DES.CVEPARADA, CA.NUMKMVIAJE, CO.CORRIDA_ID, RU.DESCRUTA, RU.INDSENTIDOIDA, CA.PRECIOBASE ");
-		sql.append("	    ) resultado ");
-		sql.append("	INNER JOIN RUTA_SECUENCIA RS ON RS.RUTA_ID = resultado.RUTA_ID ");
-		sql.append("	INNER JOIN TRAMO TR ON TR.TRAMO_ID = RS.TRAMO_ID ");
-		sql.append("	WHERE RS.ACTIVO = 1 ");
-		sql.append("	AND TR.ACTIVO = 1 ");
-		sql.append("	GROUP BY resultado.NOMBEMPRESA, resultado.CORRIDA_ID, resultado.FECHORSALIDA, resultado.ORIGEM, resultado.DESTINO, resultado.KM_TRAMO, resultado.RUTA_ID, resultado.DESCRUTA, resultado.INDSENTIDOIDA, resultado.ABSOLUTOS, resultado.RECEITA, resultado.PRECIOBASE ");
-		sql.append("    ORDER BY resultado.CORRIDA_ID ");
+		sql.append("SELECT * ");
+		sql.append("FROM   (SELECT RESULTADO_2.nombempresa, ");
+		sql.append("               RESULTADO_2.corrida_id CORRIDA_1, ");
+		sql.append("               RESULTADO_2.fechorsalida, ");
+		sql.append("               RESULTADO_2.origem, ");
+		sql.append("               RESULTADO_2.destino, ");
+		sql.append("               RESULTADO_2.km_tramo, ");
+		sql.append("               RESULTADO_2.ruta_id, ");
+		sql.append("               RESULTADO_2.descruta, ");
+		sql.append("               RESULTADO_2.indsentidoida, ");
+		sql.append("               RESULTADO_2.absolutos, ");
+		sql.append("               RESULTADO_2.receita, ");
+		sql.append("               RESULTADO_2.preciobase, ");
+		sql.append("               RESULTADO_2.viagens, ");
+		sql.append("               RESULTADO_2.km_corrida, ");
+		sql.append("               RESULTADO_2.disponibilidade, ");
+		sql.append("               RESULTADO_2.absoluto_total_corrida ");
+		sql.append("        FROM   (SELECT RESULTADO.*, ");
+		sql.append("                       (SELECT Count(*) ");
+		sql.append("                        FROM   corrida CO ");
+		sql.append("                        WHERE  CO.corrida_id = RESULTADO.corrida_id ");
+		sql.append("                               AND CO.feccorrida BETWEEN To_date( ");
+		sql.append("                                   '01/06/2013 00:00:00', ");
+		sql.append("                                                         'DD/MM/YYYY HH24:MI:SS' ");
+		sql.append("                                                         ) ");
+		sql.append("                                                         AND ");
+		sql.append("                                   To_date( ");
+		sql.append("                                   '01/06/2013 23:59:59', ");
+		sql.append("                                   'DD/MM/YYYY HH24:MI:SS')) ");
+		sql.append("                       VIAGENS, ");
+		sql.append("                       Sum(TR.cantkmreal) ");
+		sql.append("                       KM_CORRIDA, ");
+		sql.append("                       (SELECT Max(DA.cantasientos) ");
+		sql.append("                        FROM   corrida CO ");
+		sql.append("                               INNER JOIN rol_operativo ROL ");
+		sql.append("                                       ON ");
+		sql.append("                               ROL.roloperativo_id = CO.roloperativo_id ");
+		sql.append("                               INNER JOIN diagrama_autobus DA ");
+		sql.append("                                       ON DA.diagramaautobus_id = ");
+		sql.append("                                          ROL.diagramaautobus_id ");
+		sql.append("                        WHERE  CO.corrida_id = RESULTADO.corrida_id ");
+		sql.append("                               AND CO.feccorrida BETWEEN To_date( ");
+		sql.append("                                   '01/06/2013 00:00:00', ");
+		sql.append("                                                         'DD/MM/YYYY HH24:MI:SS' ");
+		sql.append("                                                         ) ");
+		sql.append("                                                         AND ");
+		sql.append("                                   To_date( ");
+		sql.append("                                   '01/06/2013 23:59:59', ");
+		sql.append("                                   'DD/MM/YYYY HH24:MI:SS') ");
+		sql.append("                        GROUP  BY CO.corrida_id) ");
+		sql.append("                               DISPONIBILIDADE, ");
+		sql.append("                       (SELECT Count(*) ");
+		sql.append("                        FROM   boleto CA ");
+		sql.append("                               INNER JOIN corrida CO ");
+		sql.append("                                       ON ( CO.corrida_id = CA.corrida_id ");
+		sql.append("                                            AND CO.feccorrida = CA.feccorrida ) ");
+		sql.append("                        WHERE  CA.activo = 1 ");
+		sql.append("                               AND CO.empresacorrida_id IN ( 25 ) ");
+		sql.append("                               AND CA.corrida_id = RESULTADO.corrida_id ");
+		sql.append("                               AND CA.feccorrida BETWEEN To_date( ");
+		sql.append("                                   '01/06/2013 00:00:00', ");
+		sql.append("                                                         'DD/MM/YYYY HH24:MI:SS' ");
+		sql.append("                                                         ) ");
+		sql.append("                                                         AND ");
+		sql.append("                                   To_date( ");
+		sql.append("                                   '01/06/2013 23:59:59', ");
+		sql.append("                                   'DD/MM/YYYY HH24:MI:SS') ");
+		sql.append("                               AND CA.motivocancelacion_id IS NULL ");
+		sql.append("                               AND CA.preciobase IS NOT NULL ");
+		sql.append("                               AND CA.preciobase > 0) ");
+		sql.append("                               ABSOLUTO_TOTAL_CORRIDA ");
+		sql.append("                FROM   (SELECT EM.nombempresa, ");
+		sql.append("                               CO.corrida_id        CORRIDA_ID, ");
+		sql.append("                               Max(CO.fechorsalida) FECHORSALIDA, ");
+		sql.append("                               ORI.cveparada        ORIGEM, ");
+		sql.append("                               DES.cveparada        DESTINO, ");
+		sql.append("                               CA.numkmviaje        KM_TRAMO, ");
+		sql.append("                               RU.ruta_id, ");
+		sql.append("                               RU.descruta, ");
+		sql.append("                               RU.indsentidoida, ");
+		sql.append("                               Count(*)             ABSOLUTOS, ");
+		sql.append("                               Sum(CA.preciopagado) RECEITA, ");
+		sql.append("                               CA.preciobase ");
+		sql.append("                        FROM   boleto CA ");
+		sql.append("                               INNER JOIN parada ORI ");
+		sql.append("                                       ON ORI.parada_id = CA.origen_id ");
+		sql.append("                               INNER JOIN parada DES ");
+		sql.append("                                       ON DES.parada_id = CA.destino_id ");
+		sql.append("                               INNER JOIN corrida CO ");
+		sql.append("                                       ON ( CO.corrida_id = CA.corrida_id ");
+		sql.append("                                            AND CO.feccorrida = CA.feccorrida ) ");
+		sql.append("                               INNER JOIN empresa EM ");
+		sql.append("                                       ON EM.empresa_id = CO.empresacorrida_id ");
+		sql.append("                               INNER JOIN ruta RU ");
+		sql.append("                                       ON RU.ruta_id = CO.ruta_id ");
+		sql.append("                        WHERE  CA.activo = 1 ");
+		sql.append("                               AND RU.activo = 1 ");
+		sql.append("                               AND EM.activo = 1 ");
+		sql.append("                               AND ORI.activo = 1 ");
+		sql.append("                               AND DES.activo = 1 ");
+		sql.append("                               AND CO.empresacorrida_id IN ( 25 ) ");
+		sql.append("                               AND CA.feccorrida BETWEEN To_date( ");
+		sql.append("                                   '01/06/2013 00:00:00', ");
+		sql.append("                                                         'DD/MM/YYYY HH24:MI:SS' ");
+		sql.append("                                                         ) ");
+		sql.append("                                                         AND ");
+		sql.append("                                   To_date( ");
+		sql.append("                                   '01/06/2013 23:59:59', ");
+		sql.append("                                   'DD/MM/YYYY HH24:MI:SS') ");
+		sql.append("                               AND CA.motivocancelacion_id IS NULL ");
+		sql.append("                               AND CA.preciobase IS NOT NULL ");
+		sql.append("                               AND CA.preciobase > 0 ");
+		sql.append("                        GROUP  BY RU.ruta_id, ");
+		sql.append("                                  EM.nombempresa, ");
+		sql.append("                                  ORI.cveparada, ");
+		sql.append("                                  DES.cveparada, ");
+		sql.append("                                  CA.numkmviaje, ");
+		sql.append("                                  CO.corrida_id, ");
+		sql.append("                                  RU.descruta, ");
+		sql.append("                                  RU.indsentidoida, ");
+		sql.append("                                  CA.preciobase) RESULTADO ");
+		sql.append("                       INNER JOIN ruta_secuencia RS ");
+		sql.append("                               ON RS.ruta_id = RESULTADO.ruta_id ");
+		sql.append("                       INNER JOIN tramo TR ");
+		sql.append("                               ON TR.tramo_id = RS.tramo_id ");
+		sql.append("                WHERE  RS.activo = 1 ");
+		sql.append("                       AND TR.activo = 1 ");
+		sql.append("                GROUP  BY RESULTADO.nombempresa, ");
+		sql.append("                          RESULTADO.corrida_id, ");
+		sql.append("                          RESULTADO.fechorsalida, ");
+		sql.append("                          RESULTADO.origem, ");
+		sql.append("                          RESULTADO.destino, ");
+		sql.append("                          RESULTADO.km_tramo, ");
+		sql.append("                          RESULTADO.ruta_id, ");
+		sql.append("                          RESULTADO.descruta, ");
+		sql.append("                          RESULTADO.indsentidoida, ");
+		sql.append("                          RESULTADO.absolutos, ");
+		sql.append("                          RESULTADO.receita, ");
+		sql.append("                          RESULTADO.preciobase ");
+		sql.append("               --ORDER BY ");
+		sql.append("               --    RESULTADO.CORRIDA_ID ");
+		sql.append("               ) RESULTADO_2 ");
+		sql.append("        GROUP  BY RESULTADO_2.nombempresa, ");
+		sql.append("                  RESULTADO_2.corrida_id, ");
+		sql.append("                  RESULTADO_2.fechorsalida, ");
+		sql.append("                  RESULTADO_2.origem, ");
+		sql.append("                  RESULTADO_2.destino, ");
+		sql.append("                  RESULTADO_2.km_tramo, ");
+		sql.append("                  RESULTADO_2.ruta_id, ");
+		sql.append("                  RESULTADO_2.descruta, ");
+		sql.append("                  RESULTADO_2.indsentidoida, ");
+		sql.append("                  RESULTADO_2.absolutos, ");
+		sql.append("                  RESULTADO_2.receita, ");
+		sql.append("                  RESULTADO_2.preciobase, ");
+		sql.append("                  RESULTADO_2.viagens, ");
+		sql.append("                  RESULTADO_2.km_corrida, ");
+		sql.append("                  RESULTADO_2.disponibilidade, ");
+		sql.append("                  RESULTADO_2.absoluto_total_corrida ");
+		sql.append("        ORDER  BY RESULTADO_2.corrida_id) T1 ");
+		sql.append("       INNER JOIN (SELECT RESULTADO_2.corrida_id       CORRIDA_2, ");
+		sql.append("                          Sum(RESULTADO_2.equivalente) EQUIVALENTE_TOTAL_CORRIDA ");
+		sql.append("                   FROM   (SELECT RESULTADO.*, ");
+		sql.append("                                  ( RESULTADO.km_tramo / Sum(TR.cantkmreal) ) * ");
+		sql.append("                                  (SELECT ");
+		sql.append("                                  Count(*) ");
+		sql.append("                                  FROM ");
+		sql.append("                                  boleto CA ");
+		sql.append("                                  INNER JOIN corrida CO ");
+		sql.append("                                          ON ( CO.corrida_id ");
+		sql.append("                                               = CA.corrida_id ");
+		sql.append("                                               AND CO.feccorrida = ");
+		sql.append("                                             CA.feccorrida ) ");
+		sql.append("                                  INNER JOIN parada PO ");
+		sql.append("                                          ON CA.origen_id = PO.parada_id ");
+		sql.append("                                  INNER JOIN parada PD ");
+		sql.append("                                          ON CA.destino_id = PD.parada_id ");
+		sql.append("                                  WHERE ");
+		sql.append("                                  CA.activo = 1 ");
+		sql.append("                                  AND CO.empresacorrida_id ");
+		sql.append("                                      IN ( 25 ) ");
+		sql.append("                                  AND CA.corrida_id = ");
+		sql.append("                                      RESULTADO.corrida_id ");
+		sql.append("                                  AND CA.feccorrida BETWEEN ");
+		sql.append("                                      To_date('01/06/2013 00:00:00', ");
+		sql.append("                                      'DD/MM/YYYY HH24:MI:SS' ");
+		sql.append("                                      ) ");
+		sql.append("                                      AND ");
+		sql.append("                                      To_date( ");
+		sql.append("                                      '01/06/2013 23:59:59', ");
+		sql.append("                                      'DD/MM/YYYY HH24:MI:SS') ");
+		sql.append("                                  AND CA.motivocancelacion_id IS NULL ");
+		sql.append("                                  AND CA.preciobase IS NOT NULL ");
+		sql.append("                                  AND CA.preciobase = RESULTADO.preciobase ");
+		sql.append("                                  AND PO.cveparada = RESULTADO.origem ");
+		sql.append("                                  AND PD.cveparada = RESULTADO.destino) ");
+		sql.append("                                  EQUIVALENTE ");
+		sql.append("                           FROM   (SELECT CO.corrida_id CORRIDA_ID, ");
+		sql.append("                                          ORI.cveparada ORIGEM, ");
+		sql.append("                                          DES.cveparada DESTINO, ");
+		sql.append("                                          CA.numkmviaje KM_TRAMO, ");
+		sql.append("                                          RU.ruta_id, ");
+		sql.append("                                          CA.preciobase ");
+		sql.append("                                   FROM   boleto CA ");
+		sql.append("                                          INNER JOIN parada ORI ");
+		sql.append("                                                  ON ORI.parada_id = ");
+		sql.append("                                                     CA.origen_id ");
+		sql.append("                                          INNER JOIN parada DES ");
+		sql.append("                                                  ON DES.parada_id = ");
+		sql.append("                                                     CA.destino_id ");
+		sql.append("                                          INNER JOIN corrida CO ");
+		sql.append("                                                  ON ( CO.corrida_id = ");
+		sql.append("                                                       CA.corrida_id ");
+		sql.append("                                                       AND ");
+		sql.append("                                          CO.feccorrida = CA.feccorrida ) ");
+		sql.append("                                          INNER JOIN empresa EM ");
+		sql.append("                                                  ON EM.empresa_id = ");
+		sql.append("                                                     CO.empresacorrida_id ");
+		sql.append("                                          INNER JOIN ruta RU ");
+		sql.append("                                                  ON RU.ruta_id = CO.ruta_id ");
+		sql.append("                                   WHERE  CA.activo = 1 ");
+		sql.append("                                          AND RU.activo = 1 ");
+		sql.append("                                          AND EM.activo = 1 ");
+		sql.append("                                          AND ORI.activo = 1 ");
+		sql.append("                                          AND DES.activo = 1 ");
+		sql.append("                                          AND CO.empresacorrida_id IN ( 25 ) ");
+		sql.append("                                          AND CA.feccorrida BETWEEN To_date( ");
+		sql.append("                                              '01/06/2013 00:00:00', ");
+		sql.append("                                              'DD/MM/YYYY HH24:MI:SS' ");
+		sql.append("                                              ) ");
+		sql.append("                                              AND ");
+		sql.append("                                              To_date( ");
+		sql.append("                                              '01/06/2013 23:59:59', ");
+		sql.append("                                              'DD/MM/YYYY HH24:MI:SS') ");
+		sql.append("                                          AND CA.motivocancelacion_id IS NULL ");
+		sql.append("                                          AND CA.preciobase IS NOT NULL ");
+		sql.append("                                          AND CA.preciobase > 0 ");
+		sql.append("                                   GROUP  BY RU.ruta_id, ");
+		sql.append("                                             EM.nombempresa, ");
+		sql.append("                                             ORI.cveparada, ");
+		sql.append("                                             DES.cveparada, ");
+		sql.append("                                             CA.numkmviaje, ");
+		sql.append("                                             CO.corrida_id, ");
+		sql.append("                                             RU.descruta, ");
+		sql.append("                                             RU.indsentidoida, ");
+		sql.append("                                             CA.preciobase) RESULTADO ");
+		sql.append("                                  INNER JOIN ruta_secuencia RS ");
+		sql.append("                                          ON RS.ruta_id = RESULTADO.ruta_id ");
+		sql.append("                                  INNER JOIN tramo TR ");
+		sql.append("                                          ON TR.tramo_id = RS.tramo_id ");
+		sql.append("                           WHERE  RS.activo = 1 ");
+		sql.append("                                  AND TR.activo = 1 ");
+		sql.append("                           GROUP  BY RESULTADO.corrida_id, ");
+		sql.append("                                     RESULTADO.origem, ");
+		sql.append("                                     RESULTADO.destino, ");
+		sql.append("                                     RESULTADO.km_tramo, ");
+		sql.append("                                     RESULTADO.ruta_id, ");
+		sql.append("                                     RESULTADO.preciobase) RESULTADO_2 ");
+		sql.append("                   GROUP  BY RESULTADO_2.corrida_id ");
+		sql.append("                   ORDER  BY RESULTADO_2.corrida_id)T2 ");
+		sql.append("               ON T1.corrida_1 = T2.corrida_2 ");
 
+		
 		return sql.toString();
 	}
 }
diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioTaxasLinha.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioTaxasLinha.java
index 4a58e67c7..22c765378 100644
--- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioTaxasLinha.java
+++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioTaxasLinha.java
@@ -63,7 +63,7 @@ public class RelatorioTaxasLinha extends Relatorio {
 			public Object valueCustomFields(String fieldName) throws Exception {
 
 				// Se não for pra subtrair o ICMS, realiza o calculo e adiciona o mesmo
-				if (!(Boolean) this.relatorio.getParametros().get("B_SUBTRAIR_ICMS")) {
+				if ((Boolean) this.relatorio.getParametros().get("B_SUBTRAIR_ICMS")) {
 					BigDecimal valorIcms = BigDecimal.ZERO;
 					String indInterestadual = this.resultSet.getString("INTERESTADUAL");
 					Integer puntoVentaId = this.resultSet.getInt("PUNTOVENTA_ID");
@@ -71,27 +71,27 @@ public class RelatorioTaxasLinha extends Relatorio {
 					try {
 						if (fieldName.equals("IMPORTETAXAEMBARQUE") && this.resultSet.getBigDecimal("IMPORTETAXAEMBARQUE") != null && !this.resultSet.getBigDecimal("IMPORTETAXAEMBARQUE").equals(BigDecimal.ZERO)) {
 							valorIcms = CalculoImposto.getValorImposto(this.relatorio.getConexao(), puntoVentaId, indInterestadual, BigDecimal.ZERO, BigDecimal.ZERO, this.resultSet.getBigDecimal("IMPORTETAXAEMBARQUE"), BigDecimal.ZERO);
-							return this.resultSet.getBigDecimal("IMPORTETAXAEMBARQUE").add(valorIcms);
+							return this.resultSet.getBigDecimal("IMPORTETAXAEMBARQUE").subtract(valorIcms);
 						}
 						else if (fieldName.equals("IMPORTEPEDAGIO") && this.resultSet.getBigDecimal("IMPORTEPEDAGIO") != null && !this.resultSet.getBigDecimal("IMPORTEPEDAGIO").equals(BigDecimal.ZERO)) {
 							valorIcms = CalculoImposto.getValorImposto(this.relatorio.getConexao(), puntoVentaId, indInterestadual, BigDecimal.ZERO, BigDecimal.ZERO, BigDecimal.ZERO, this.resultSet.getBigDecimal("IMPORTEPEDAGIO"));
-							return this.resultSet.getBigDecimal("IMPORTEPEDAGIO").add(valorIcms);
+							return this.resultSet.getBigDecimal("IMPORTEPEDAGIO").subtract(valorIcms);
 						}
 						else if (fieldName.equals("IMPORTESEGURO") && this.resultSet.getBigDecimal("IMPORTESEGURO") != null && !this.resultSet.getBigDecimal("IMPORTESEGURO").equals(BigDecimal.ZERO)) {
 							valorIcms = CalculoImposto.getValorImposto(this.relatorio.getConexao(), puntoVentaId, indInterestadual, BigDecimal.ZERO, this.resultSet.getBigDecimal("IMPORTESEGURO"), BigDecimal.ZERO, BigDecimal.ZERO);
-							return this.resultSet.getBigDecimal("IMPORTESEGURO").add(valorIcms);
+							return this.resultSet.getBigDecimal("IMPORTESEGURO").subtract(valorIcms);
 						}
 						else if (fieldName.equals("TOTAL_EMBARQUE") && !this.resultSet.getBigDecimal("TOTAL_EMBARQUE").equals(BigDecimal.ZERO)) {
 							valorIcms = CalculoImposto.getValorImposto(this.relatorio.getConexao(), puntoVentaId, indInterestadual, BigDecimal.ZERO, this.resultSet.getBigDecimal("TOTAL_EMBARQUE"), BigDecimal.ZERO, BigDecimal.ZERO);
-							return this.resultSet.getBigDecimal("TOTAL_EMBARQUE").add(valorIcms);
+							return this.resultSet.getBigDecimal("TOTAL_EMBARQUE").subtract(valorIcms);
 						}
 						else if (fieldName.equals("TOTAL_PEDAGIO") && !this.resultSet.getBigDecimal("TOTAL_PEDAGIO").equals(BigDecimal.ZERO)) {
 							valorIcms = CalculoImposto.getValorImposto(this.relatorio.getConexao(), puntoVentaId, indInterestadual, BigDecimal.ZERO, BigDecimal.ZERO, BigDecimal.ZERO, this.resultSet.getBigDecimal("TOTAL_PEDAGIO"));
-							return this.resultSet.getBigDecimal("TOTAL_PEDAGIO").add(valorIcms);
+							return this.resultSet.getBigDecimal("TOTAL_PEDAGIO").subtract(valorIcms);
 						}
 						else if (fieldName.equals("TOTAL_SEGURO") && !this.resultSet.getBigDecimal("TOTAL_SEGURO").equals(BigDecimal.ZERO)) {
 							valorIcms = CalculoImposto.getValorImposto(this.relatorio.getConexao(), puntoVentaId, indInterestadual, BigDecimal.ZERO, this.resultSet.getBigDecimal("TOTAL_SEGURO"), BigDecimal.ZERO, BigDecimal.ZERO);
-							return this.resultSet.getBigDecimal("TOTAL_SEGURO").add(valorIcms);
+							return this.resultSet.getBigDecimal("TOTAL_SEGURO").subtract(valorIcms);
 						}
 					} catch (Exception e) {
 						if (e instanceof ExceptionConfiguracao)
diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioOrigemDestino.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioOrigemDestino.jasper
index a02b9c3535e1c0b8a31982740b3186d4e875d5d2..1e838f94dc3bdd6a3ae9ae242bbeb19fa5f9b0a3 100644
GIT binary patch
delta 11138
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
Ot@5jq-Z2>#J^l}W-uLnV

delta 11693
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

diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioOrigemDestino.jrxml b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioOrigemDestino.jrxml
index 08c8f6f5c..88dc2197f 100644
--- a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioOrigemDestino.jrxml
+++ b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioOrigemDestino.jrxml
@@ -41,7 +41,7 @@
 		<variableExpression><![CDATA[$F{RECEITA}]]></variableExpression>
 	</variable>
 	<variable name="equivalente" class="java.math.BigDecimal" resetType="Group" resetGroup="group_corrida_id">
-		<variableExpression><![CDATA[($F{KM_TRAMO}.divide($F{KM_CORRIDA}, 2, 2)).multiply(new BigDecimal($F{ABSOLUTOS}.toString()))]]></variableExpression>
+		<variableExpression><![CDATA[$F{KM_TRAMO}.multiply(new BigDecimal($F{ABSOLUTOS}.toString())).divide($F{KM_CORRIDA}, 4, 2)]]></variableExpression>
 	</variable>
 	<variable name="pax_km" class="java.math.BigDecimal" resetType="Group" resetGroup="group_corrida_id">
 		<variableExpression><![CDATA[$V{equivalente}.multiply($F{KM_CORRIDA})]]></variableExpression>
@@ -59,7 +59,7 @@
 		<variableExpression><![CDATA[$F{PRECIOBASE}]]></variableExpression>
 	</variable>
 	<variable name="por_equivalente" class="java.math.BigDecimal" resetType="Group" resetGroup="group_corrida_id">
-		<variableExpression><![CDATA[$V{equivalente}.divide( $F{EQUIVALENTE_TOTAL_CORRIDA},4, 2 ).multiply(new BigDecimal("100"))]]></variableExpression>
+		<variableExpression><![CDATA[$V{equivalente}.multiply(new BigDecimal("100")).divide($F{EQUIVALENTE_TOTAL_CORRIDA}, 4, 2)]]></variableExpression>
 	</variable>
 	<variable name="sum_por_equivalente" class="java.math.BigDecimal" resetType="Group" resetGroup="group_corrida_id" calculation="Sum">
 		<variableExpression><![CDATA[$V{por_equivalente}]]></variableExpression>
@@ -71,7 +71,7 @@
 		<variableExpression><![CDATA[$F{RECEITA}]]></variableExpression>
 	</variable>
 	<variable name="porc_abs" class="java.math.BigDecimal" resetType="Group" resetGroup="group_corrida_id">
-		<variableExpression><![CDATA[$F{ABSOLUTOS}.divide( new BigDecimal($F{ABSOLUTO_TOTAL_CORRIDA}.toString()), 4,2 ).multiply(new BigDecimal("100"))]]></variableExpression>
+		<variableExpression><![CDATA[$F{ABSOLUTOS}.multiply(new BigDecimal("100")).divide( new BigDecimal($F{ABSOLUTO_TOTAL_CORRIDA}.toString()), 4,2 )]]></variableExpression>
 	</variable>
 	<variable name="rec_abs" class="java.math.BigDecimal" resetType="Group" resetGroup="group_corrida_id">
 		<variableExpression><![CDATA[$F{RECEITA}.divide( new BigDecimal($F{ABSOLUTOS}.toString()), 2,2)]]></variableExpression>
@@ -294,7 +294,9 @@
 				</textField>
 				<textField pattern="#,##0.00">
 					<reportElement uuid="186bc0ae-ff2b-404c-ab57-7c9144108e72" x="463" y="1" width="44" height="20"/>
-					<textElement textAlignment="Right"/>
+					<textElement textAlignment="Right">
+						<font isBold="true"/>
+					</textElement>
 					<textFieldExpression><![CDATA[$V{sum_porc_abs}.compareTo(new BigDecimal("100.00"))>0?new BigDecimal("100.00"):$V{sum_porc_abs}]]></textFieldExpression>
 				</textField>
 				<staticText>