From 3720296024190c1f62a0da86435b95d01a5c9c60 Mon Sep 17 00:00:00 2001
From: carla <carla@d1611594-4594-4d17-8e1d-87c2c4800839>
Date: Wed, 23 Jan 2013 17:00:05 +0000
Subject: [PATCH] =?UTF-8?q?corre=C3=A7=C3=A3o=20de=20erros=20cadastro=20de?=
 =?UTF-8?q?=20agencia?=
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@23847 d1611594-4594-4d17-8e1d-87c2c4800839
---
 .../dao/hibernate/MarcaHibernateDAO.java      | 22 +++++++++++++------
 .../ventaboletos/entidad/EsquemaCorrida.java  | 12 +++++++++-
 2 files changed, 26 insertions(+), 8 deletions(-)

diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/MarcaHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/MarcaHibernateDAO.java
index 22f26e336..4ea47595b 100644
--- a/src/com/rjconsultores/ventaboletos/dao/hibernate/MarcaHibernateDAO.java
+++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/MarcaHibernateDAO.java
@@ -80,13 +80,21 @@ public class MarcaHibernateDAO extends GenericHibernateDAO<Marca, Short>
 	
 
 	
-	public List<Marca> buscarMarcaPorEmpresa(List<Empresa> usuario) {
-		Criteria c = getSession().createCriteria(getPersistentClass());
-		c.add(Restrictions.eq("activo", Boolean.TRUE));
-		 for (Empresa id : usuario) {
-	            c.add(Restrictions.eq("empresa", id));
-	      }
-        return c.list();
+	public List<Marca> buscarMarcaPorEmpresa(List<Empresa> empresa) {
+		String hql = " select new com.rjconsultores.ventaboletos.entidad.Marca(marca.marcaId, marca.descmarca) from Marca marca " +
+		" where  ";
+		for(Empresa e: empresa){
+    		
+			hql = hql + " marca.empresa.empresaId = "+ e.getEmpresaId() + " or";
+			
+		}
+		
+		hql = hql.substring(0,hql.length()-3);
+		
+    	Query sq = getSession().createQuery(hql);
+    	
+		List<Marca> lsMarca = sq.list();
+		return lsMarca;
 	}
 
 }
diff --git a/src/com/rjconsultores/ventaboletos/entidad/EsquemaCorrida.java b/src/com/rjconsultores/ventaboletos/entidad/EsquemaCorrida.java
index 40100ba16..10866a5ad 100644
--- a/src/com/rjconsultores/ventaboletos/entidad/EsquemaCorrida.java
+++ b/src/com/rjconsultores/ventaboletos/entidad/EsquemaCorrida.java
@@ -116,6 +116,8 @@ public class EsquemaCorrida implements Serializable {
     private Integer numCorrida;
     @Column(name = "NUMCORRIDAPISOEXTRA")
     private Integer numCorridaPisoExtra;
+    @Column(name = "INDGENERAFERIADO")
+	private String indGeneraFeriado;
 
     public String getTipocorrida() {
         return tipocorrida;
@@ -396,8 +398,16 @@ public class EsquemaCorrida implements Serializable {
     public void setNumCorridaPisoExtra(Integer numCorridaPisoExtra) {
         this.numCorridaPisoExtra = numCorridaPisoExtra;
     }
+    
+    public String getIndGeneraFeriado() {
+		return indGeneraFeriado;
+	}
 
-    @Override
+	public void setIndGeneraFeriado(String indGeneraFeriado) {
+		this.indGeneraFeriado = indGeneraFeriado;
+	}
+
+	@Override
     public int hashCode() {
         int hash = 0;
         hash += (esquemacorridaId != null ? esquemacorridaId.hashCode() : 0);