From d4e6d326f380bb6bd83e97a4af801749f0f79ed6 Mon Sep 17 00:00:00 2001
From: carla <carla@d1611594-4594-4d17-8e1d-87c2c4800839>
Date: Wed, 17 Oct 2012 17:45:29 +0000
Subject: [PATCH] =?UTF-8?q?corre=C3=A7=C3=A3o=20da=20valida=C3=A7=C3=A3o?=
 =?UTF-8?q?=20do=20campo=20numCorrida?=
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@22115 d1611594-4594-4d17-8e1d-87c2c4800839
---
 .../ventaboletos/dao/EsquemaCorridaDAO.java   |  4 +--
 .../hibernate/EsquemaCorridaHibernateDAO.java | 26 +++++++------------
 .../service/EsquemaCorridaService.java        |  5 ++--
 .../impl/EsquemaCorridaServiceImpl.java       |  8 +++---
 4 files changed, 17 insertions(+), 26 deletions(-)

diff --git a/src/com/rjconsultores/ventaboletos/dao/EsquemaCorridaDAO.java b/src/com/rjconsultores/ventaboletos/dao/EsquemaCorridaDAO.java
index d07d8e421..9fe40b677 100644
--- a/src/com/rjconsultores/ventaboletos/dao/EsquemaCorridaDAO.java
+++ b/src/com/rjconsultores/ventaboletos/dao/EsquemaCorridaDAO.java
@@ -29,9 +29,9 @@ public interface EsquemaCorridaDAO extends GenericDAO<EsquemaCorrida, Integer> {
     public List<EsquemaCorrida> buscar(EsquemaCorrida ec);
     
     
-    public boolean buscarNumCorrida (Integer numCorrida);
+    public boolean buscarNumCorrida (Integer numCorrida, Integer numCorridaPisoExtra);
     
-    public boolean buscarNumCorridaPisoExtra(Integer numCorridaPisoExtra);
+
     
     /**
      * Indica se el esquema corrida es hijo de un esquemCorrida.
diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/EsquemaCorridaHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/EsquemaCorridaHibernateDAO.java
index 9c2abf6d8..f8d1d8b39 100644
--- a/src/com/rjconsultores/ventaboletos/dao/hibernate/EsquemaCorridaHibernateDAO.java
+++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/EsquemaCorridaHibernateDAO.java
@@ -227,11 +227,17 @@ public class EsquemaCorridaHibernateDAO extends GenericHibernateDAO<EsquemaCorri
 	
 	
 	@Override
-	public boolean buscarNumCorrida(Integer numCorrida) {
+	public boolean buscarNumCorrida(Integer numCorrida, Integer numCorridaPisoExtra) {
 		Criteria c = getSession().createCriteria(getPersistentClass());
 		c.add(Restrictions.eq("activo", Boolean.TRUE));
-
-		c.add(Restrictions.eq("numCorrida", numCorrida));
+		Disjunction or = Restrictions.disjunction();
+		
+		
+		or.add(Restrictions.or(Restrictions.eq("numCorridaPisoExtra", numCorridaPisoExtra), Restrictions.eq("numCorrida", numCorrida)));
+		or.add(Restrictions.eq("numCorrida", numCorridaPisoExtra));
+		
+		c.add(or);
+		
 
 		if (c.list().isEmpty()) {
 			return false;
@@ -241,17 +247,5 @@ public class EsquemaCorridaHibernateDAO extends GenericHibernateDAO<EsquemaCorri
 	}
 	
 	
-	@Override
-	public boolean buscarNumCorridaPisoExtra(Integer numCorridaPisoExtra) {
-		Criteria c = getSession().createCriteria(getPersistentClass());
-		c.add(Restrictions.eq("activo", Boolean.TRUE));
-
-		c.add(Restrictions.eq("numCorridaPisoExtra", numCorridaPisoExtra));
-
-		if (c.list().isEmpty()) {
-			return false;
-		} else {
-			return true;
-		}
-	}
+	
 }
\ No newline at end of file
diff --git a/src/com/rjconsultores/ventaboletos/service/EsquemaCorridaService.java b/src/com/rjconsultores/ventaboletos/service/EsquemaCorridaService.java
index 3c3f722bb..88d4250ba 100644
--- a/src/com/rjconsultores/ventaboletos/service/EsquemaCorridaService.java
+++ b/src/com/rjconsultores/ventaboletos/service/EsquemaCorridaService.java
@@ -30,9 +30,8 @@ public interface EsquemaCorridaService extends GenericService<EsquemaCorrida, In
 
     public List<EsquemaCorrida> buscar(EsquemaCorrida ec);
     
-    public boolean buscarNumCorrida(Integer numCorrida);
-    
-    public boolean buscarNumCorridaPisoExtra(Integer numCorridaPisoExtra);
+    public boolean buscarNumCorrida(Integer numCorrida, Integer numCorridaPisoExtra);
+
     
     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 254e2adbe..b81a08e99 100644
--- a/src/com/rjconsultores/ventaboletos/service/impl/EsquemaCorridaServiceImpl.java
+++ b/src/com/rjconsultores/ventaboletos/service/impl/EsquemaCorridaServiceImpl.java
@@ -102,13 +102,11 @@ public class EsquemaCorridaServiceImpl implements EsquemaCorridaService {
 		return esquemaCorridaDAO.buscar(ec);
 	}
 	
-	public boolean buscarNumCorrida (Integer numCorrida) {
-		return esquemaCorridaDAO.buscarNumCorrida(numCorrida);
+	public boolean buscarNumCorrida (Integer numCorrida, Integer numCorridaPisoExtra) {
+		return esquemaCorridaDAO.buscarNumCorrida(numCorrida, numCorridaPisoExtra);
 	}
 	
-	public boolean buscarNumCorridaPisoExtra (Integer numCorridaPisoExtra) {
-		return esquemaCorridaDAO.buscarNumCorridaPisoExtra(numCorridaPisoExtra);
-	}
+	
 
 	@Transactional
 	public void actualizaEsquemaTramo(List<ParadaEsquema> listParadaEsquema, EsquemaCorrida ec) {