diff --git a/src/com/rjconsultores/ventaboletos/dao/TipoVentaDAO.java b/src/com/rjconsultores/ventaboletos/dao/TipoVentaDAO.java index b875ce2ff..607133f97 100644 --- a/src/com/rjconsultores/ventaboletos/dao/TipoVentaDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/TipoVentaDAO.java @@ -18,4 +18,6 @@ public interface TipoVentaDAO extends GenericDAO{ public TipoVenta obtenerID(Short tipoventaId); + public List obterTiposVentaIntegracao(); + } diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/TipoVentaHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/TipoVentaHibernateDAO.java index 898410ece..05a78388c 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/TipoVentaHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/TipoVentaHibernateDAO.java @@ -6,8 +6,11 @@ package com.rjconsultores.ventaboletos.dao.hibernate; import com.rjconsultores.ventaboletos.dao.TipoVentaDAO; import com.rjconsultores.ventaboletos.entidad.TipoVenta; +import com.rjconsultores.ventaboletos.vo.segurida.PerfilJerarquia; + import java.util.List; import org.hibernate.Criteria; +import org.hibernate.Query; import org.hibernate.SessionFactory; import org.hibernate.criterion.Order; import org.hibernate.criterion.Restrictions; @@ -52,4 +55,16 @@ public class TipoVentaHibernateDAO extends GenericHibernateDAO obterTiposVentaIntegracao() { + StringBuilder sb = new StringBuilder(); + sb.append(" from TipoVenta x "); + sb.append(" where x.activo = 1 and x.tipoventaId in (12,99)"); + sb.append(" order by x.desctipoventa "); + + Query query = getSession().createQuery(sb.toString()); + + return query.list(); + } } diff --git a/src/com/rjconsultores/ventaboletos/entidad/TipoVenta.java b/src/com/rjconsultores/ventaboletos/entidad/TipoVenta.java index 29dc52551..a3c3361c8 100644 --- a/src/com/rjconsultores/ventaboletos/entidad/TipoVenta.java +++ b/src/com/rjconsultores/ventaboletos/entidad/TipoVenta.java @@ -111,6 +111,6 @@ public class TipoVenta implements Serializable { @Override public String toString() { - return "com.rjconsultores.ventaboletos.entidad.TipoVenta[tipoventaId=" + tipoventaId + "]"; + return getDesctipoventa(); } } diff --git a/src/com/rjconsultores/ventaboletos/entidad/Usuario.java b/src/com/rjconsultores/ventaboletos/entidad/Usuario.java index ae79baa3d..7bdf77919 100644 --- a/src/com/rjconsultores/ventaboletos/entidad/Usuario.java +++ b/src/com/rjconsultores/ventaboletos/entidad/Usuario.java @@ -109,6 +109,9 @@ public class Usuario implements Serializable, UserDetails/*, Authentication*/ { @Column(name = "ESTACIONINTERNET_ID") private Long estacionInternetId; + @Column(name = "TIPOVENTAINTEGRACAO_ID") + private Long tipoVentaIntegracaoId; + /* Lista de permissoes do usuario */ @Transient private List listClavesPermisos; @@ -469,4 +472,12 @@ public class Usuario implements Serializable, UserDetails/*, Authentication*/ { public void setEstacionInternetId(Long estacionInternetId) { this.estacionInternetId = estacionInternetId; } + + public Long getTipoVentaIntegracaoId() { + return tipoVentaIntegracaoId; + } + + public void setTipoVentaIntegracaoId(Long tipoVentaIntegracaoId) { + this.tipoVentaIntegracaoId = tipoVentaIntegracaoId; + } } diff --git a/src/com/rjconsultores/ventaboletos/service/TipoVentaService.java b/src/com/rjconsultores/ventaboletos/service/TipoVentaService.java index 1ca70ba1a..919646d82 100644 --- a/src/com/rjconsultores/ventaboletos/service/TipoVentaService.java +++ b/src/com/rjconsultores/ventaboletos/service/TipoVentaService.java @@ -18,4 +18,6 @@ public interface TipoVentaService extends GenericService{ public TipoVenta obtenerID(Short tipoventaId); + public List obterTiposVentaIntegracao(); + } diff --git a/src/com/rjconsultores/ventaboletos/service/impl/TipoVentaServiceImpl.java b/src/com/rjconsultores/ventaboletos/service/impl/TipoVentaServiceImpl.java index b4a81f639..032b0c1f5 100644 --- a/src/com/rjconsultores/ventaboletos/service/impl/TipoVentaServiceImpl.java +++ b/src/com/rjconsultores/ventaboletos/service/impl/TipoVentaServiceImpl.java @@ -66,4 +66,8 @@ public class TipoVentaServiceImpl implements TipoVentaService { public TipoVenta obtenerID(Short tipoventaId) { return tipoVentaDAO.obtenerID(tipoventaId); } + + public List obterTiposVentaIntegracao() { + return tipoVentaDAO.obterTiposVentaIntegracao(); + } }