From 41d978ea793bef870c3ae8228a5fd187c308a2b8 Mon Sep 17 00:00:00 2001
From: thiago <thiago@d1611594-4594-4d17-8e1d-87c2c4800839>
Date: Fri, 11 Oct 2019 18:17:17 +0000
Subject: [PATCH] =?UTF-8?q?fixed=20bug#15864=20dev:Wilian=20qua:Wallysson?=
 =?UTF-8?q?=20Altera=C3=A7=C3=A3o=20em=20query=20onde=20tinha=20plano=20ca?=
 =?UTF-8?q?rtesiano=20em=20trechos=20com=20mesma=20origem=20e=20destino=20?=
 =?UTF-8?q?por=C3=A9m=20com=20vias=20diferentes.?=
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/Model/trunk/modelWeb@98223 d1611594-4594-4d17-8e1d-87c2c4800839
---
 .../dao/hibernate/ConferenciaComissaoHibernateDAO.java   | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/ConferenciaComissaoHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/ConferenciaComissaoHibernateDAO.java
index a2f4ca31a..4e904151c 100644
--- a/src/com/rjconsultores/ventaboletos/dao/hibernate/ConferenciaComissaoHibernateDAO.java
+++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/ConferenciaComissaoHibernateDAO.java
@@ -839,7 +839,9 @@ public class ConferenciaComissaoHibernateDAO extends GenericHibernateDAO<Confere
 					.append("CF.IMPORTE AS \"importeFp\", COMFP.COMEMPFORMAPAGO_ID AS \"comempformapagoId\", ")
 					.append("(select max(COMEMPCATEGORIA_ID) from COM_EMP_CATEGORIA where CATEGORIA_ID = C.CATEGORIA_ID AND EMPRESA_ID  = M.EMPRESA_ID AND ACTIVO = 1) AS \"comempcategoriaId\", C.NOMBPASAJERO AS \"nombpasajero\", ")
 					.append("E.INDCARBOLETOSDEVOLVIDOSCONF AS \"indcarboletosdevolvidosconf\", C.FECCORRIDA AS \"feccorrida\", C.CORRIDA_ID \"corridaId\", ")
-					.append("COALESCE(T.PRECIO, C.PRECIOBASE, 0) + NVL(T.IMPORTEPEDAGIO,0) + NVL(T.IMPORTETAXAEMBARQUE,0) + NVL(T.IMPORTESEGURO,0) + NVL(T.IMPORTEOUTROS,0) AS \"valorTabela\", ")
+					.append("case when t.tarifa_id is not null then nvl(t.precio, 0) + nvl(t.importepedagio, 0) + nvl(t.importetaxaembarque, 0) + nvl(t.importeseguro, 0) + nvl ")
+				    .append("(t.importeoutros, 0) else nvl(c.preciobase,0) + nvl(c.importepedagio, 0) + nvl(c.importetaxaembarque, 0) + nvl(c.importeseguro, 0) + nvl ")
+				    .append("(c.importeoutros, 0) end AS \"valorTabela\"," )
 					.append("C.INDCANCELACION AS \"indCancelacion\", C.INDREIMPRESION AS \"indreimpresion\", C.FECCORTE AS \"feccorte\", C.TRANSACAOORIGINAL_ID AS \"transacaoOriginalId\", ")
 					.append("EI.ICMS as \"icmsBase\", EST.ESTADO_ID as \"estadoId\", ")
 					.append("CASE WHEN C.PTOVTAVENTA_ID = :puntoventaId OR C.PTOVTAVENTA_ID IS NULL THEN 1 ELSE 0 END AS ptoVtaOrigem, ")
@@ -859,6 +861,7 @@ public class ConferenciaComissaoHibernateDAO extends GenericHibernateDAO<Confere
 					.append("LEFT JOIN CIUDAD CID ON CID.CIUDAD_ID = ORI.CIUDAD_ID ")
 					.append("LEFT JOIN ESTADO EST ON EST.ESTADO_ID = CID.ESTADO_ID ")
 					.append("LEFT JOIN CATEGORIA CAT ON CAT.CATEGORIA_ID = C.CATEGORIA_ID ")
+					.append("LEFT JOIN CORRIDA_TRAMO CT ON CT.CORRIDA_ID = C.CORRIDA_ID AND CT.FECCORRIDA = C.FECCORRIDA AND CT.ORIGEN_ID = C.ORIGEN_ID AND CT.DESTINO_ID = C.DESTINO_ID ")
 					.append("LEFT JOIN LOG_CONFERENCIA LOG ON LOG.CAJA_ID = C.CAJA_ID AND LOG.ACTIVO = 1 ")
 					.append("LEFT JOIN MOTIVO_CANCELACION MC ON MC.MOTIVOCANCELACION_ID = C.MOTIVOCANCELACION_ID ")
 					.append("INNER JOIN CAJA_FORMAPAGO CF ON CF.CAJA_ID = C.CAJA_ID ")
@@ -868,9 +871,9 @@ public class ConferenciaComissaoHibernateDAO extends GenericHibernateDAO<Confere
 					.append("INNER JOIN EMPRESA E ON E.EMPRESA_ID = M.EMPRESA_ID ")
 					.append("LEFT JOIN EMPRESA_IMPOSTO EI ON (EI.ESTADO_ID = EST.ESTADO_ID AND EI.EMPRESA_ID = E.EMPRESA_ID AND EI.ACTIVO = 1) ")
 					.append("LEFT JOIN COM_EMP_FORMAPAGO COMFP ON COMFP.FORMAPAGO_ID = FP.FORMAPAGO_ID AND COMFP.EMPRESA_ID = M.EMPRESA_ID AND COMFP.ACTIVO = 1 ")
-					.append("LEFT JOIN TARIFA T ON (T.DESTINO_ID = C.DESTINO_ID AND T.CLASESERVICIO_ID = C.CLASESERVICIO_ID AND T.MARCA_ID = M.MARCA_ID AND T.ORIGEN_ID = C.ORIGEN_ID AND T.RUTA_ID = C.RUTA_ID and T.ACTIVO = 1) ")
+					.append("LEFT JOIN TARIFA T ON (T.DESTINO_ID = C.DESTINO_ID AND T.CLASESERVICIO_ID = C.CLASESERVICIO_ID AND T.MARCA_ID = M.MARCA_ID AND T.ORIGEN_ID = C.ORIGEN_ID AND T.RUTA_ID = C.RUTA_ID and T.ACTIVO = 1 and (ct.tramo_id = t.tramo_id)) ")
 					.append("LEFT JOIN VIGENCIA_TARIFA VT ON (VT.VIGENCIATARIFA_ID = T.VIGENCIATARIFA_ID ) ")
-					.append("WHERE C.ACTIVO = 1 AND (T.TARIFA_ID IS NULL OR T.TARIFA_ID IS NOT NULL  AND C.FECHORVENTA BETWEEN VT.FECINICIOVIGENCIA AND VT.FECFINVIGENCIA) ")
+					.append("WHERE C.ACTIVO = 1 AND (T.TARIFA_ID IS NULL OR (T.TARIFA_ID IS NOT NULL  AND C.FECHORVENTA BETWEEN VT.FECINICIOVIGENCIA AND VT.FECFINVIGENCIA)) ")
 					.append("AND C.FECCORTE BETWEEN TO_DATE(:dataInicial, 'DD/MM/YYYY') AND TO_DATE(:dataFinal, 'DD/MM/YYYY') ")
 					.append("AND ((C.INDSTATUSBOLETO = 'E' AND C.INDREIMPRESION = 1) OR C.INDREIMPRESION = 0 OR C.MOTIVOCANCELACION_ID = :motivoCancelacionGeracaoOcd) ");
 			parametros.put("motivoCancelacionGeracaoOcd", Constantes.MVO_CANCEL_GERACAO_OCD.intValue());