From c700a213db296fc109f7742ede27b06b5e3b4c4e Mon Sep 17 00:00:00 2001
From: gleimar <gleimar@d1611594-4594-4d17-8e1d-87c2c4800839>
Date: Tue, 26 Apr 2016 13:31:41 +0000
Subject: [PATCH] fixes bug#7385

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Model/trunk/modelWeb@55270 d1611594-4594-4d17-8e1d-87c2c4800839
---
 .../dao/ConfRestricaoCanalVentaDAO.java          | 11 ++++++++++-
 .../ConfRestricaoCanalVentaHibernateDAO.java     | 16 +---------------
 .../service/ConfRestricaoCanalVentaService.java  |  4 ----
 .../impl/ConfRestricaoCanalVentaServiceImpl.java | 15 +++++----------
 4 files changed, 16 insertions(+), 30 deletions(-)

diff --git a/src/com/rjconsultores/ventaboletos/dao/ConfRestricaoCanalVentaDAO.java b/src/com/rjconsultores/ventaboletos/dao/ConfRestricaoCanalVentaDAO.java
index 12ddcd794..1d3e427a5 100644
--- a/src/com/rjconsultores/ventaboletos/dao/ConfRestricaoCanalVentaDAO.java
+++ b/src/com/rjconsultores/ventaboletos/dao/ConfRestricaoCanalVentaDAO.java
@@ -2,6 +2,15 @@ package com.rjconsultores.ventaboletos.dao;
 
 import com.rjconsultores.ventaboletos.entidad.ConfRestricaoCanalVenta;
 
-public interface ConfRestricaoCanalVentaDAO extends GenericDAO<ConfRestricaoCanalVenta, Integer>{
+public interface ConfRestricaoCanalVentaDAO{
 
+	public ConfRestricaoCanalVenta obtenerID(Integer id);
+
+	public ConfRestricaoCanalVenta suscribir(ConfRestricaoCanalVenta entidad);
+
+	public ConfRestricaoCanalVenta actualizacion(ConfRestricaoCanalVenta entidad);
+
+	public void borrar(ConfRestricaoCanalVenta entidad);
+
+	public Long count(String campo, Object o);
 }
diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/ConfRestricaoCanalVentaHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/ConfRestricaoCanalVentaHibernateDAO.java
index faf8a6e2a..0129454eb 100644
--- a/src/com/rjconsultores/ventaboletos/dao/hibernate/ConfRestricaoCanalVentaHibernateDAO.java
+++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/ConfRestricaoCanalVentaHibernateDAO.java
@@ -1,10 +1,6 @@
 package com.rjconsultores.ventaboletos.dao.hibernate;
 
-import java.util.List;
-
-import org.hibernate.Criteria;
 import org.hibernate.SessionFactory;
-import org.hibernate.criterion.Restrictions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.stereotype.Repository;
@@ -13,20 +9,10 @@ import com.rjconsultores.ventaboletos.dao.ConfRestricaoCanalVentaDAO;
 import com.rjconsultores.ventaboletos.entidad.ConfRestricaoCanalVenta;
 
 @Repository("confRestricaoCanalVentaDAO")
-public class ConfRestricaoCanalVentaHibernateDAO extends GenericHibernateDAO<ConfRestricaoCanalVenta, Integer>
-		implements ConfRestricaoCanalVentaDAO {
+public class ConfRestricaoCanalVentaHibernateDAO extends GenericHibernateDAO<ConfRestricaoCanalVenta, Integer> implements ConfRestricaoCanalVentaDAO {
 
 	@Autowired
 	public ConfRestricaoCanalVentaHibernateDAO(@Qualifier("sessionFactory") SessionFactory factory) {
 		setSessionFactory(factory);
 	}
-
-	@SuppressWarnings("unchecked")
-	@Override
-	public List<ConfRestricaoCanalVenta> obtenerTodos() {
-		Criteria c = getSession().createCriteria(getPersistentClass());
-		c.add(Restrictions.eq("activo", Boolean.TRUE));
-
-		return c.list();
-	}
 }
diff --git a/src/com/rjconsultores/ventaboletos/service/ConfRestricaoCanalVentaService.java b/src/com/rjconsultores/ventaboletos/service/ConfRestricaoCanalVentaService.java
index 0a5f9d072..2186bc9b1 100644
--- a/src/com/rjconsultores/ventaboletos/service/ConfRestricaoCanalVentaService.java
+++ b/src/com/rjconsultores/ventaboletos/service/ConfRestricaoCanalVentaService.java
@@ -1,14 +1,10 @@
 package com.rjconsultores.ventaboletos.service;
 
-import java.util.List;
-
 import com.rjconsultores.ventaboletos.entidad.ConfRestricaoCanalVenta;
 import com.rjconsultores.ventaboletos.exception.BusinessException;
 
 public interface ConfRestricaoCanalVentaService{
 
-	public List<ConfRestricaoCanalVenta> obtenerTodos();
-
 	public ConfRestricaoCanalVenta obtenerID(Integer id);
 
 	public void borrar(ConfRestricaoCanalVenta entidad);
diff --git a/src/com/rjconsultores/ventaboletos/service/impl/ConfRestricaoCanalVentaServiceImpl.java b/src/com/rjconsultores/ventaboletos/service/impl/ConfRestricaoCanalVentaServiceImpl.java
index 19bf76b76..d5f67edf3 100644
--- a/src/com/rjconsultores/ventaboletos/service/impl/ConfRestricaoCanalVentaServiceImpl.java
+++ b/src/com/rjconsultores/ventaboletos/service/impl/ConfRestricaoCanalVentaServiceImpl.java
@@ -19,12 +19,7 @@ import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado;
 public class ConfRestricaoCanalVentaServiceImpl implements ConfRestricaoCanalVentaService {
 	@Autowired
 	private ConfRestricaoCanalVentaDAO confRestricaoCanalVentaDAO;
-	
-	private List<ConfRestricaoCanalVenta> lsConfRestricaoCanalVenta;
 
-	public List<ConfRestricaoCanalVenta> obtenerTodos() {
-		return confRestricaoCanalVentaDAO.obtenerTodos();
-	}
 
 	public ConfRestricaoCanalVenta obtenerID(Integer id) {
 		return confRestricaoCanalVentaDAO.obtenerID(id);
@@ -51,11 +46,11 @@ public class ConfRestricaoCanalVentaServiceImpl implements ConfRestricaoCanalVen
 			throw new BusinessException("confRestricaoCanalVentaService.MSG.oriDestObliga");
 		}
 		
-		lsConfRestricaoCanalVenta = obtenerTodos();
-		
-		if(isBloqueoExistente(entidad, lsConfRestricaoCanalVenta)){
-			throw new BusinessException("editarConfRestricaoCanalVentaController.MSG.bloqueoExistente");
-		}
+//		lsConfRestricaoCanalVenta = obtenerTodos();
+//		
+//		if(isBloqueoExistente(entidad, lsConfRestricaoCanalVenta)){
+//			throw new BusinessException("editarConfRestricaoCanalVentaController.MSG.bloqueoExistente");
+//		}
 		
 		entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId());
 		entidad.setFecmodif(Calendar.getInstance().getTime());