From 180fc6c1e21917e27aec7fd82a3d51fdd222d4b2 Mon Sep 17 00:00:00 2001
From: leonardo <leonardo@d1611594-4594-4d17-8e1d-87c2c4800839>
Date: Thu, 7 Mar 2019 20:38:26 +0000
Subject: [PATCH] =?UTF-8?q?13714:=20Relat=C3=B3rio=20embarque=20por=20loca?=
 =?UTF-8?q?lidade=20-=20AGERBA=20bug#13714=20dev:lucas=20qua:renato?=
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@90544 d1611594-4594-4d17-8e1d-87c2c4800839
---
 .../rjconsultores/ventaboletos/dao/RutaDAO.java  |  2 ++
 .../dao/hibernate/RutaHibernateDAO.java          | 16 +++++++++++++++-
 .../ventaboletos/service/RutaService.java        |  1 +
 .../service/impl/RutaServiceImpl.java            |  4 ++++
 4 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/src/com/rjconsultores/ventaboletos/dao/RutaDAO.java b/src/com/rjconsultores/ventaboletos/dao/RutaDAO.java
index 6fc43e29a..a0b8356a0 100644
--- a/src/com/rjconsultores/ventaboletos/dao/RutaDAO.java
+++ b/src/com/rjconsultores/ventaboletos/dao/RutaDAO.java
@@ -60,6 +60,8 @@ public interface RutaDAO extends GenericDAO<Ruta, Integer> {
 	public List<Ruta> buscaRuta(String palavraPesquisaRuta, OrgaoConcedente orgao);
 	
 	public List<Ruta> buscaRutasFromOrgao(OrgaoConcedente orgao);
+	
+	public List<Ruta> buscaSomenteRutasFromOrgao(OrgaoConcedente orgao);
 
 	public List<Ruta> buscarPorRutaPorEmpresas(List<Empresa> lsEmpresas);
 	
diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/RutaHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/RutaHibernateDAO.java
index d1f050428..0a2eb6858 100644
--- a/src/com/rjconsultores/ventaboletos/dao/hibernate/RutaHibernateDAO.java
+++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/RutaHibernateDAO.java
@@ -239,12 +239,26 @@ public class RutaHibernateDAO extends GenericHibernateDAO<Ruta, Integer> impleme
 		return qry.list();
 	}
 
-	public List<Ruta> buscaRutasFromOrgao(OrgaoConcedente orgao) {
+	public List<Ruta> buscaRutasFromOrgao(OrgaoConcedente orgao) { // busca rutas e pedágios
 		StringBuffer hql = new StringBuffer();
 		hql.append("select distinct r FROM  Ruta  r inner join  r.rutaSecuenciaList rSeqList  ");
 		hql.append(" inner join  rSeqList.lsRutaCase casRutaList  ");
 		hql.append("      WHERE  r.orgaoConcedente.orgaoConcedenteId = :orgaoId and r.activo = 1 and r.indRutaCancelada = 0 ");
+		hql.append(" order by r.descruta    ");
+		
+		Query sq = getSession().createQuery(hql.toString());
+		sq.setParameter("orgaoId", orgao.getOrgaoConcedenteId());
 
+		List<Ruta> lsRuta = sq.list();
+		return lsRuta;
+	}
+	
+	public List<Ruta> buscaSomenteRutasFromOrgao(OrgaoConcedente orgao) {
+		StringBuffer hql = new StringBuffer();
+		hql.append("select distinct r FROM  Ruta  r  ");
+		hql.append(" WHERE  r.orgaoConcedente.orgaoConcedenteId = :orgaoId and r.activo = 1 and r.indRutaCancelada = 0 ");
+		hql.append(" order by r.descruta    ");
+		
 		Query sq = getSession().createQuery(hql.toString());
 		sq.setParameter("orgaoId", orgao.getOrgaoConcedenteId());
 
diff --git a/src/com/rjconsultores/ventaboletos/service/RutaService.java b/src/com/rjconsultores/ventaboletos/service/RutaService.java
index 33512967e..17dbe9997 100644
--- a/src/com/rjconsultores/ventaboletos/service/RutaService.java
+++ b/src/com/rjconsultores/ventaboletos/service/RutaService.java
@@ -91,6 +91,7 @@ public interface RutaService {
 	public List<Ruta> buscaRuta(String palavraPesquisaRuta, OrgaoConcedente orgao);
 	
 	public List<Ruta> buscaRutasFromOrgao(OrgaoConcedente orgao);
+	public List<Ruta> buscaSomenteRutasFromOrgao(OrgaoConcedente orgao);
 	
 	public List<Ruta> buscarTodosEstos(Integer[] idRutas);
 	
diff --git a/src/com/rjconsultores/ventaboletos/service/impl/RutaServiceImpl.java b/src/com/rjconsultores/ventaboletos/service/impl/RutaServiceImpl.java
index 0a2d0c74d..e5799cfbd 100644
--- a/src/com/rjconsultores/ventaboletos/service/impl/RutaServiceImpl.java
+++ b/src/com/rjconsultores/ventaboletos/service/impl/RutaServiceImpl.java
@@ -514,6 +514,10 @@ public class RutaServiceImpl implements RutaService {
 	public List<Ruta> buscaRutasFromOrgao(OrgaoConcedente orgao) {
 		return rutaDAO.buscaRutasFromOrgao(orgao);
 	}
+	
+	public List<Ruta> buscaSomenteRutasFromOrgao(OrgaoConcedente orgao) {
+		return rutaDAO.buscaSomenteRutasFromOrgao(orgao);
+	}
 
 	@Override
 	public List<Ruta> buscarRutasPorEmpresas(List<Empresa> lsEmp) {