From 812556e15bb584b3e4ceeb96d7fbca08663a279d Mon Sep 17 00:00:00 2001
From: frederico <frederico@d1611594-4594-4d17-8e1d-87c2c4800839>
Date: Tue, 2 Feb 2016 13:22:14 +0000
Subject: [PATCH] =?UTF-8?q?fixed=20bug=20#6971=20-=20corre=C3=A7=C3=A3o=20?=
 =?UTF-8?q?das=20ordena=C3=A7=C3=B5es=20dos=20itens=2076=20e=20115?=
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@52502 d1611594-4594-4d17-8e1d-87c2c4800839
---
 .../rjconsultores/ventaboletos/dao/CasetaPeajeDAO.java |  1 +
 .../dao/hibernate/CalcularPeajeHibernateDAO.java       |  2 ++
 .../dao/hibernate/CasetaPeajeHibernateDAO.java         | 10 +++++++++-
 .../ventaboletos/service/CasetaPeajeService.java       |  1 +
 .../service/impl/CasetaPeajeServiceImpl.java           |  7 ++++++-
 5 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/src/com/rjconsultores/ventaboletos/dao/CasetaPeajeDAO.java b/src/com/rjconsultores/ventaboletos/dao/CasetaPeajeDAO.java
index 6fba07675..ab4a4946a 100644
--- a/src/com/rjconsultores/ventaboletos/dao/CasetaPeajeDAO.java
+++ b/src/com/rjconsultores/ventaboletos/dao/CasetaPeajeDAO.java
@@ -7,4 +7,5 @@ import com.rjconsultores.ventaboletos.entidad.CasetaPeaje;
 public interface CasetaPeajeDAO extends GenericDAO<CasetaPeaje, Integer> {
 
 	List<CasetaPeaje> buscar(String casetaPeajeDesc);
+	List<CasetaPeaje> buscarTodosOrdenadoPorDescricao();
 }
\ No newline at end of file
diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/CalcularPeajeHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/CalcularPeajeHibernateDAO.java
index c80c28d82..4ce5cddd7 100644
--- a/src/com/rjconsultores/ventaboletos/dao/hibernate/CalcularPeajeHibernateDAO.java
+++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/CalcularPeajeHibernateDAO.java
@@ -41,6 +41,8 @@ public class CalcularPeajeHibernateDAO extends GenericHibernateDAO<String, Strin
 			sql.append(" and r.orgaoConcedente.orgaoConcedenteId =  :orgaoConcedenteId  ");
 		}
 		
+		sql.append(" order by r.descruta ");
+		
 		Query query = getSession().createQuery(sql.toString());
 		
 		if(oc != null && oc.getOrgaoConcedenteId() != null){
diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/CasetaPeajeHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/CasetaPeajeHibernateDAO.java
index a7035ea41..5c93544be 100644
--- a/src/com/rjconsultores/ventaboletos/dao/hibernate/CasetaPeajeHibernateDAO.java
+++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/CasetaPeajeHibernateDAO.java
@@ -4,6 +4,7 @@ import java.util.List;
 
 import org.hibernate.Criteria;
 import org.hibernate.SessionFactory;
+import org.hibernate.criterion.Order;
 import org.hibernate.criterion.Restrictions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
@@ -27,7 +28,14 @@ public class CasetaPeajeHibernateDAO extends GenericHibernateDAO<CasetaPeaje, In
 		c.add(Restrictions.eq("activo", Boolean.TRUE));
 		return (List<CasetaPeaje>) c.list();
 	}
-
+	
+	public List<CasetaPeaje> buscarTodosOrdenadoPorDescricao() {
+		Criteria c = getSession().createCriteria(getPersistentClass());
+		c.add(Restrictions.eq("activo", Boolean.TRUE));
+		c.addOrder(Order.asc("desccaseta"));
+		return (List<CasetaPeaje>) c.list();
+	}
+	
 	@SuppressWarnings("unchecked")
 	@Override
 	public List<CasetaPeaje> buscar(String casetaPeajeDesc) {
diff --git a/src/com/rjconsultores/ventaboletos/service/CasetaPeajeService.java b/src/com/rjconsultores/ventaboletos/service/CasetaPeajeService.java
index a37569ffe..219faba82 100644
--- a/src/com/rjconsultores/ventaboletos/service/CasetaPeajeService.java
+++ b/src/com/rjconsultores/ventaboletos/service/CasetaPeajeService.java
@@ -7,4 +7,5 @@ import com.rjconsultores.ventaboletos.entidad.CasetaPeaje;
 public interface CasetaPeajeService extends GenericService<CasetaPeaje, Integer> {
 	public List<CasetaPeaje> buscar(String descricaoPracaPedagio);
 	public Boolean validarDescricaoCasetaPeaje(CasetaPeaje casetaPeaje);
+	public List<CasetaPeaje> buscarTodosOrdenadoPorDescricao();
 }
\ No newline at end of file
diff --git a/src/com/rjconsultores/ventaboletos/service/impl/CasetaPeajeServiceImpl.java b/src/com/rjconsultores/ventaboletos/service/impl/CasetaPeajeServiceImpl.java
index 8ca20c05a..9e769d135 100644
--- a/src/com/rjconsultores/ventaboletos/service/impl/CasetaPeajeServiceImpl.java
+++ b/src/com/rjconsultores/ventaboletos/service/impl/CasetaPeajeServiceImpl.java
@@ -22,7 +22,12 @@ public class CasetaPeajeServiceImpl implements CasetaPeajeService {
 	public List<CasetaPeaje> obtenerTodos() {
 		return casetaPeajeDAO.obtenerTodos();
 	}
-
+	
+	@Override
+	public List<CasetaPeaje> buscarTodosOrdenadoPorDescricao() {
+		return casetaPeajeDAO.buscarTodosOrdenadoPorDescricao();
+	}
+	
 	@Transactional
 	public CasetaPeaje obtenerID(Integer id) {
 		return casetaPeajeDAO.obtenerID(id);