From eb29d28b78bcbd62f8b075edb7cab115694a6006 Mon Sep 17 00:00:00 2001
From: julio <julio@d1611594-4594-4d17-8e1d-87c2c4800839>
Date: Tue, 12 Aug 2014 17:32:57 +0000
Subject: [PATCH] =?UTF-8?q?Duplicidade=20de=20marca=20em=20pre=C3=A7o=20em?=
 =?UTF-8?q?=20escala=20(fixed=20bug=20#5577)=20Tempo:=201=20hora?=
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@37212 d1611594-4594-4d17-8e1d-87c2c4800839
---
 .../MarcaClaseServicioHibernateDAO.java       | 41 +++++++++++--------
 1 file changed, 24 insertions(+), 17 deletions(-)

diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/MarcaClaseServicioHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/MarcaClaseServicioHibernateDAO.java
index 1c361573a..134152e36 100644
--- a/src/com/rjconsultores/ventaboletos/dao/hibernate/MarcaClaseServicioHibernateDAO.java
+++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/MarcaClaseServicioHibernateDAO.java
@@ -19,30 +19,37 @@ import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.stereotype.Repository;
 
 /**
- *
+ * 
  * @author Administrador
  */
 @Repository("marcaClaseServicioDAO")
 public class MarcaClaseServicioHibernateDAO
-        extends GenericHibernateDAO<MarcaClaseServicio, MarcaClaseServicioPK>
-        implements MarcaClaseServicioDAO {
+		extends GenericHibernateDAO<MarcaClaseServicio, MarcaClaseServicioPK>
+		implements MarcaClaseServicioDAO {
 
-    @Autowired
-    public MarcaClaseServicioHibernateDAO(@Qualifier("sessionFactory") SessionFactory factory) {
-        setSessionFactory(factory);
-    }
+	@Autowired
+	public MarcaClaseServicioHibernateDAO(@Qualifier("sessionFactory") SessionFactory factory) {
+		setSessionFactory(factory);
+	}
 
-    @Override
-    public List<MarcaClaseServicio> obtenerTodos() {
-        Criteria c = getSession().createCriteria(getPersistentClass());
-        c.add(Restrictions.eq("activo", Boolean.TRUE));
+	@Override
+	public List<MarcaClaseServicio> obtenerTodos() {
+		Criteria c = getSession().createCriteria(getPersistentClass());
+		c.add(Restrictions.eq("activo", Boolean.TRUE));
 
-        return c.list();
-    }
+		return c.list();
+	}
 
-    public List<Marca> buscar(ClaseServicio clase) {
-        Query q = getSession().createQuery("select mc.marcaClaseservicioPK.marca from MarcaClaseServicio mc where mc.activo = 1 and mc.marcaClaseservicioPK.claseservicio.claseservicioId = " + clase.getClaseservicioId());
+	public List<Marca> buscar(ClaseServicio clase) {
 
-        return q.list();
-    }
+		StringBuilder hql = new StringBuilder();
+		hql.append(" select mc.marcaClaseservicioPK.marca ");
+		hql.append("     from MarcaClaseServicio mc  ");
+		hql.append(" where mc.activo = 1 and mc.marcaClaseservicioPK.marca.activo=1 ");
+		hql.append("           and mc.marcaClaseservicioPK.claseservicio.claseservicioId = " + clase.getClaseservicioId());
+
+		Query q = getSession().createQuery(hql.toString());
+
+		return q.list();
+	}
 }