From 2f2319b53d6f9c82e445377c553eaaf21064cf43 Mon Sep 17 00:00:00 2001
From: thiago <thiago@d1611594-4594-4d17-8e1d-87c2c4800839>
Date: Wed, 24 Aug 2016 20:24:37 +0000
Subject: [PATCH] =?UTF-8?q?fixed=20bug=20#7860=20-=20Corre=C3=A7=C3=A3o=20?=
 =?UTF-8?q?de=20bug=20ao=20tentar=20cadastrar=20servi=C3=A7o=20.?=
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@59562 d1611594-4594-4d17-8e1d-87c2c4800839
---
 .../rjconsultores/ventaboletos/dao/EsquemaCorridaDAO.java  | 2 +-
 .../dao/hibernate/EsquemaCorridaHibernateDAO.java          | 7 ++++++-
 .../ventaboletos/service/EsquemaCorridaService.java        | 2 +-
 .../service/impl/EsquemaCorridaServiceImpl.java            | 4 ++--
 4 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/com/rjconsultores/ventaboletos/dao/EsquemaCorridaDAO.java b/src/com/rjconsultores/ventaboletos/dao/EsquemaCorridaDAO.java
index d8d4bb167..77c7c3b8c 100644
--- a/src/com/rjconsultores/ventaboletos/dao/EsquemaCorridaDAO.java
+++ b/src/com/rjconsultores/ventaboletos/dao/EsquemaCorridaDAO.java
@@ -28,7 +28,7 @@ public interface EsquemaCorridaDAO extends GenericDAO<EsquemaCorrida, Integer> {
 
 	public List<EsquemaCorrida> buscar(Marca marca, RolOperativo rolOperativo, Ruta ruta, ClaseServicio claseServicio);
 
-	public boolean buscarNumCorrida(Integer numCorrida, Integer numCorridaPisoExtra);
+	public boolean buscarNumCorrida(Integer numCorrida, Integer numCorridaPisoExtra, boolean isDoublePiso);
 
 	public EsquemaCorrida buscaEsquemaPorRuta(Ruta ruta);
 
diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/EsquemaCorridaHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/EsquemaCorridaHibernateDAO.java
index bf6c47686..6a5ac46ac 100644
--- a/src/com/rjconsultores/ventaboletos/dao/hibernate/EsquemaCorridaHibernateDAO.java
+++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/EsquemaCorridaHibernateDAO.java
@@ -185,13 +185,18 @@ public class EsquemaCorridaHibernateDAO extends GenericHibernateDAO<EsquemaCorri
 	}
 
 	@Override
-	public boolean buscarNumCorrida(Integer numCorrida, Integer numCorridaPisoExtra) {
+	public boolean buscarNumCorrida(Integer numCorrida, Integer numCorridaPisoExtra, boolean isDoublePiso) {
 		Criteria c = getSession().createCriteria(getPersistentClass());
 		c.add(Restrictions.eq("activo", Boolean.TRUE));
 		Disjunction or = Restrictions.disjunction();
+		
+		if(isDoublePiso){
 
 		or.add(Restrictions.or(Restrictions.eq("numCorridaPisoExtra", numCorridaPisoExtra), Restrictions.eq("numCorrida", numCorrida)));
 		or.add(Restrictions.eq("numCorrida", numCorridaPisoExtra));
+		}else{
+			or.add(Restrictions.eq("numCorrida", numCorrida));
+		}
 
 		c.add(or);
 
diff --git a/src/com/rjconsultores/ventaboletos/service/EsquemaCorridaService.java b/src/com/rjconsultores/ventaboletos/service/EsquemaCorridaService.java
index 1e3332924..947f44060 100644
--- a/src/com/rjconsultores/ventaboletos/service/EsquemaCorridaService.java
+++ b/src/com/rjconsultores/ventaboletos/service/EsquemaCorridaService.java
@@ -30,7 +30,7 @@ public interface EsquemaCorridaService extends GenericService<EsquemaCorrida, In
 
 	public List<EsquemaCorrida> buscar(Marca marca, RolOperativo rolOperativo, Ruta ruta, ClaseServicio claseServicio);
 
-	public boolean buscarNumCorrida(Integer numCorrida, Integer numCorridaPisoExtra);
+	public boolean buscarNumCorrida(Integer numCorrida, Integer numCorridaPisoExtra, boolean isDoublePiso);
 
 	public void actualizaEsquemaTramo(List<ParadaEsquema> listParadaEsquema, EsquemaCorrida ec);
 
diff --git a/src/com/rjconsultores/ventaboletos/service/impl/EsquemaCorridaServiceImpl.java b/src/com/rjconsultores/ventaboletos/service/impl/EsquemaCorridaServiceImpl.java
index dda4af327..e62be9726 100644
--- a/src/com/rjconsultores/ventaboletos/service/impl/EsquemaCorridaServiceImpl.java
+++ b/src/com/rjconsultores/ventaboletos/service/impl/EsquemaCorridaServiceImpl.java
@@ -117,8 +117,8 @@ public class EsquemaCorridaServiceImpl implements EsquemaCorridaService {
 		return esquemaCorridaDAO.buscar(marca, rolOperativo, ruta, claseServicio);
 	}
 
-	public boolean buscarNumCorrida(Integer numCorrida, Integer numCorridaPisoExtra) {
-		return esquemaCorridaDAO.buscarNumCorrida(numCorrida, numCorridaPisoExtra);
+	public boolean buscarNumCorrida(Integer numCorrida, Integer numCorridaPisoExtra, boolean isDoublePiso) {
+		return esquemaCorridaDAO.buscarNumCorrida(numCorrida, numCorridaPisoExtra, isDoublePiso);
 	}
 
 	@Transactional