From a6aca7c44106f6e3a6b7bd2a6b7dad2d59be0714 Mon Sep 17 00:00:00 2001
From: aristides <aristides@d1611594-4594-4d17-8e1d-87c2c4800839>
Date: Fri, 8 Jul 2022 20:44:47 +0000
Subject: [PATCH] fixes bug#24700 qua: dev:Valdevir

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Model/trunk/modelWeb@113257 d1611594-4594-4d17-8e1d-87c2c4800839
---
 .../dao/hibernate/TarifaOficialHibernateDAO.java       | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/TarifaOficialHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/TarifaOficialHibernateDAO.java
index 2a79cf6de..b9e06e46e 100644
--- a/src/com/rjconsultores/ventaboletos/dao/hibernate/TarifaOficialHibernateDAO.java
+++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/TarifaOficialHibernateDAO.java
@@ -311,13 +311,15 @@ public class TarifaOficialHibernateDAO extends GenericHibernateDAO<TarifaOficial
 			sql.append(" using  ");
 			sql.append(" ( ");
 			sql.append(" WITH tarifas_ofic as ( ");
-			sql.append(" select tarifaoficial_id, ORGAOCONCEDENTE_ID, ruta_id , origen_id , DESTINO_ID  from tarifa_oficial where  activo = 1");
+			sql.append(" select tarifaoficial_id, ORGAOCONCEDENTE_ID, ruta_id , origen_id , DESTINO_ID, MARCA_ID  from tarifa_oficial where  activo = 1");
 			sql.append(" ),  ");
 
 			sql.append(" 		      noArtesp as (select  p.destino_id dest, p.origen_id as orig , p.ruta_id as idruta ,p.orgaoconcedente_id as idorgao, ");
-			sql.append(" 		        p.importepeaje as importe , p.activo as actv from peaje p inner join tarifas_ofic tof on ");
+			sql.append(" 		        p.importepeaje as importe , p.activo as actv,  m.marca_id as marca from peaje p inner join tarifas_ofic tof on ");
 			sql.append(" 		      p.ORGAOCONCEDENTE_ID = tof.ORGAOCONCEDENTE_ID and p.ruta_id = tof.ruta_id ");
-			sql.append(" 		      and p.ORIGEN_ID = tof.ORIGEN_ID and p.DESTINO_ID = tof.DESTINO_ID and p.activo = 1), ");
+			sql.append(" 		      and p.ORIGEN_ID = tof.ORIGEN_ID and p.DESTINO_ID = tof.DESTINO_ID and p.activo = 1 ");
+			sql.append("              inner join ruta_empresa re on p.ruta_id=re.ruta_id ");
+			sql.append("              inner join marca m on m.marca_id=tof.marca_id where re.empresa_id=m.empresa_id), ");
 
 			sql.append(" 		     linha as ( select * from ruta where ruta_id in (select ruta_id from tarifas_ofic   ) )   , ");
 			sql.append(" 		     linha_voltaId as (select ru.ruta_id rutavolta_id, t_1.ruta_id as ida from ruta ru  ");
@@ -377,7 +379,7 @@ public class TarifaOficialHibernateDAO extends GenericHibernateDAO<TarifaOficial
 			sql.append("   peaje_tarifas as ( ");
 			sql.append("     select * from peaje p inner join tarifas_ofic tof on  ");
 			sql.append("     p.ORGAOCONCEDENTE_ID = tof.ORGAOCONCEDENTE_ID and p.ruta_id = tof.ruta_id  ");
-			sql.append("     and p.ORIGEN_ID = tof.ORIGEN_ID and p.DESTINO_ID = tof.DESTINO_ID and p.activo = 1 ");
+			sql.append("     and p.ORIGEN_ID = tof.ORIGEN_ID and p.DESTINO_ID = tof.DESTINO_ID and noar.MARCA = tof.MARCA_ID and p.activo = 1 ");
 			sql.append("   ) ");
 			sql.append("     select  pf.tarifaoficial_id , sum(round(importepeaje,2)) as soma from peaje_tarifas pf Group by pf.tarifaoficial_id ");
 			sql.append("    ");