From baf26f56ae0d41a44a33a6f3402b8d98131cb52a Mon Sep 17 00:00:00 2001 From: alberto Date: Wed, 18 Apr 2018 22:35:04 +0000 Subject: [PATCH] [BPE] - Parametrizar campos fixos do BPE bug#10901 dev:lucas qua:regis git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Model/trunk/modelWeb@81138 d1611594-4594-4d17-8e1d-87c2c4800839 --- .../rjconsultores/ventaboletos/dao/ClasseServicoDAO.java | 2 +- .../dao/hibernate/ClasseServicoHibernateDAO.java | 6 +++++- .../ventaboletos/service/ClaseServicioService.java | 2 +- .../ventaboletos/service/impl/ClaseServicioServiceImpl.java | 4 ++-- 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/src/com/rjconsultores/ventaboletos/dao/ClasseServicoDAO.java b/src/com/rjconsultores/ventaboletos/dao/ClasseServicoDAO.java index 11d6da15d..9d0ac85c8 100644 --- a/src/com/rjconsultores/ventaboletos/dao/ClasseServicoDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/ClasseServicoDAO.java @@ -13,7 +13,7 @@ import java.util.List; */ public interface ClasseServicoDAO extends GenericDAO { - public List buscarPorNome(String nomeClaseServicio); + public List buscarPorNome(Integer idClaseServicio, String nomeClaseServicio); public List buscarTodosExceto(Integer ... idClase); diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/ClasseServicoHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/ClasseServicoHibernateDAO.java index f858db584..94631b39c 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/ClasseServicoHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/ClasseServicoHibernateDAO.java @@ -57,11 +57,15 @@ public class ClasseServicoHibernateDAO extends GenericHibernateDAO buscarPorNome(String nomeClaseServicio) { + public List buscarPorNome(Integer idClaseServicio, String nomeClaseServicio) { Criteria c = getSession().createCriteria(getPersistentClass()); c.add(Restrictions.eq("activo", Boolean.TRUE)); c.add(Restrictions.eq("descclase", nomeClaseServicio)); + if (idClaseServicio != null) { + c.add(Restrictions.ne("claseservicioId", idClaseServicio)); + } + return c.list(); } diff --git a/src/com/rjconsultores/ventaboletos/service/ClaseServicioService.java b/src/com/rjconsultores/ventaboletos/service/ClaseServicioService.java index 0930f69ad..5cf7dd4ff 100644 --- a/src/com/rjconsultores/ventaboletos/service/ClaseServicioService.java +++ b/src/com/rjconsultores/ventaboletos/service/ClaseServicioService.java @@ -15,7 +15,7 @@ import java.util.List; */ public interface ClaseServicioService extends GenericService { - public List buscarPorNome(String nomeClaseServicio); + public List buscarPorNome(Integer idClaseServicio, String nomeClaseServicio); public List buscarTodosExceto(Integer ... idClase); diff --git a/src/com/rjconsultores/ventaboletos/service/impl/ClaseServicioServiceImpl.java b/src/com/rjconsultores/ventaboletos/service/impl/ClaseServicioServiceImpl.java index f3179830e..942ba52ec 100644 --- a/src/com/rjconsultores/ventaboletos/service/impl/ClaseServicioServiceImpl.java +++ b/src/com/rjconsultores/ventaboletos/service/impl/ClaseServicioServiceImpl.java @@ -62,8 +62,8 @@ public class ClaseServicioServiceImpl implements ClaseServicioService { claseServicoDAO.actualizacion(entidad); } - public List buscarPorNome(String nomeClaseServicio) { - return claseServicoDAO.buscarPorNome(nomeClaseServicio); + public List buscarPorNome(Integer idClaseServicio, String nomeClaseServicio) { + return claseServicoDAO.buscarPorNome(idClaseServicio, nomeClaseServicio); } public List buscarTodosExceto(Integer ... idClase){