From c20b2e2aa70409068d9978b69e390ea97b8d98e0 Mon Sep 17 00:00:00 2001 From: emerson Date: Wed, 31 Oct 2018 18:48:31 +0000 Subject: [PATCH] fixes bug#0011951 dev: thiago qua: wallysson MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Implementação efetuada conforme evidência. git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Model/trunk/modelWeb@86665 d1611594-4594-4d17-8e1d-87c2c4800839 --- .../constantes/ConstantesFuncionSistema.java | 1 + .../ventaboletos/dao/CategoriaDAO.java | 2 ++ .../ventaboletos/dao/GenericDAO.java | 1 - .../dao/hibernate/CategoriaHibernateDAO.java | 10 ++++++++++ .../dao/hibernate/GenericHibernateDAO.java | 12 ++++++----- .../dao/hibernate/RutaHibernateDAO.java | 2 +- .../ventaboletos/entidad/Parada.java | 1 - .../ventaboletos/enums/TypeEventListener.java | 20 +++++++++++++++++++ .../service/impl/CategoriaServiceImpl.java | 5 +++++ 9 files changed, 46 insertions(+), 8 deletions(-) create mode 100644 src/com/rjconsultores/ventaboletos/enums/TypeEventListener.java diff --git a/src/com/rjconsultores/ventaboletos/constantes/ConstantesFuncionSistema.java b/src/com/rjconsultores/ventaboletos/constantes/ConstantesFuncionSistema.java index c93f9c214..a3f941227 100644 --- a/src/com/rjconsultores/ventaboletos/constantes/ConstantesFuncionSistema.java +++ b/src/com/rjconsultores/ventaboletos/constantes/ConstantesFuncionSistema.java @@ -16,6 +16,7 @@ public class ConstantesFuncionSistema { public static final String CLAVE_CALCULODIARIOCOMISSAO_AUTORIZACAOCALCULOTODASAGENCIAS = "COM.RJCONSULTORES.ADM.CALCULODIARIOCOMISSAO.AUTORIZACAOCALCULOTODASAGENCIAS"; public static final String CLAVE_HISTORICO_COMPRAS = "COM.RJCONSULTORES.ADMINISTRACION.GUI.RELATORIOS.MENU.RELATORIOHISTORICOCOMPRAS"; public static final String CLAVE_EXPORTACAO_SGTI = "COM.RJCONSULTORES.ADMINISTRACION.GUI.ANALITICO.SGTI"; + public static final String CLAVE_POSICAO_VENDA_BILHETE_IDOSO = "COM.RJCONSULTORES.ADMINISTRACION.GUI.RELATORIOS.MENU.RELATORIOPOSICAOVENDABILHETEIDOSO"; diff --git a/src/com/rjconsultores/ventaboletos/dao/CategoriaDAO.java b/src/com/rjconsultores/ventaboletos/dao/CategoriaDAO.java index e641e515a..7d322feed 100644 --- a/src/com/rjconsultores/ventaboletos/dao/CategoriaDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/CategoriaDAO.java @@ -14,4 +14,6 @@ import java.util.List; public interface CategoriaDAO extends GenericDAO { public List buscar(String desccategoria); + + public List buscarCategoriaPesquisada(String desccategoria); } diff --git a/src/com/rjconsultores/ventaboletos/dao/GenericDAO.java b/src/com/rjconsultores/ventaboletos/dao/GenericDAO.java index 701153b0a..e6d526eb7 100644 --- a/src/com/rjconsultores/ventaboletos/dao/GenericDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/GenericDAO.java @@ -26,5 +26,4 @@ public interface GenericDAO { public Long count(String campo, Object o); public void suscribirTodos(Collection entidades); - } diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/CategoriaHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/CategoriaHibernateDAO.java index e935d3d32..0bd0ba10b 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/CategoriaHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/CategoriaHibernateDAO.java @@ -9,6 +9,7 @@ import com.rjconsultores.ventaboletos.entidad.Categoria; import java.util.List; import org.hibernate.Criteria; import org.hibernate.SessionFactory; +import org.hibernate.criterion.MatchMode; import org.hibernate.criterion.Order; import org.hibernate.criterion.Restrictions; import org.springframework.beans.factory.annotation.Autowired; @@ -44,4 +45,13 @@ public class CategoriaHibernateDAO extends GenericHibernateDAO buscarCategoriaPesquisada(String desccategoria) { + Criteria c = getSession().createCriteria(getPersistentClass()); + c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.ilike("desccategoria", desccategoria, MatchMode.ANYWHERE)); + + return c.list(); + } } diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/GenericHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/GenericHibernateDAO.java index edd49c964..6eb72ab33 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/GenericHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/GenericHibernateDAO.java @@ -1,14 +1,10 @@ package com.rjconsultores.ventaboletos.dao.hibernate; -/* - * To change this template, choose Tools | Templates - * and open the template in the editor. - */ -import com.rjconsultores.ventaboletos.dao.GenericDAO; import java.io.Serializable; import java.lang.reflect.ParameterizedType; import java.util.Collection; import java.util.List; + import org.hibernate.Criteria; import org.hibernate.HibernateException; import org.hibernate.criterion.Criterion; @@ -16,6 +12,12 @@ import org.hibernate.criterion.Projections; import org.hibernate.criterion.Restrictions; import org.springframework.orm.hibernate3.support.HibernateDaoSupport; +/* + * To change this template, choose Tools | Templates + * and open the template in the editor. + */ +import com.rjconsultores.ventaboletos.dao.GenericDAO; + /** * * @author gleimar diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/RutaHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/RutaHibernateDAO.java index b2c35ff73..d1f050428 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/RutaHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/RutaHibernateDAO.java @@ -201,7 +201,7 @@ public class RutaHibernateDAO extends GenericHibernateDAO impleme hql.append(" OR lower(prefixo) like :palavraPesquisaRuta "); hql.append(" OR lower(str(numRuta)) like :palavraPesquisaRuta) "); if (orgao != null) { - hql.append(" AND orgao.orgaoConcedenteId = :orgaoId "); + hql.append(" AND r.orgaoConcedente.orgaoConcedenteId = :orgaoId "); } Query sq = getSession().createQuery(hql.toString()); diff --git a/src/com/rjconsultores/ventaboletos/entidad/Parada.java b/src/com/rjconsultores/ventaboletos/entidad/Parada.java index 7cc8a4686..08d81f6ba 100644 --- a/src/com/rjconsultores/ventaboletos/entidad/Parada.java +++ b/src/com/rjconsultores/ventaboletos/entidad/Parada.java @@ -25,7 +25,6 @@ import javax.persistence.Table; import javax.persistence.Temporal; import javax.persistence.TemporalType; -import org.hibernate.annotations.CascadeType; import org.hibernate.annotations.Fetch; import org.hibernate.annotations.FetchMode; diff --git a/src/com/rjconsultores/ventaboletos/enums/TypeEventListener.java b/src/com/rjconsultores/ventaboletos/enums/TypeEventListener.java new file mode 100644 index 000000000..154745f72 --- /dev/null +++ b/src/com/rjconsultores/ventaboletos/enums/TypeEventListener.java @@ -0,0 +1,20 @@ +package com.rjconsultores.ventaboletos.enums; + +public enum TypeEventListener { + + ON_CHANGE("onChange"), + ON_CLICK("onClick"), + ON_DOUBLE_CLICK("onDoubleClick"), + ON_CTRL_KEY("onCtrlKey"); + + private String event; + + private TypeEventListener(String event) { + this.event = event; + } + + public String getEvent() { + return event; + } + +} diff --git a/src/com/rjconsultores/ventaboletos/service/impl/CategoriaServiceImpl.java b/src/com/rjconsultores/ventaboletos/service/impl/CategoriaServiceImpl.java index e293e1da9..3d66d3465 100644 --- a/src/com/rjconsultores/ventaboletos/service/impl/CategoriaServiceImpl.java +++ b/src/com/rjconsultores/ventaboletos/service/impl/CategoriaServiceImpl.java @@ -65,6 +65,11 @@ public class CategoriaServiceImpl implements CategoriaService { return categoriaDAO.buscar(desccategoria); } + @Override + public List buscarCategoriaPesquisada(String desccategoria) { + return categoriaDAO.buscarCategoriaPesquisada(desccategoria); + } + public List obtenerTodasCategoriasVisibles() { List listCategoriasVisibles = new ArrayList(); List lsCategorias = obtenerTodos();