diff --git a/pom.xml b/pom.xml index 33e5601ec..dee571ded 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 br.com.rjconsultores ModelWeb - 1.86.0 + 1.87.0 diff --git a/src/com/rjconsultores/ventaboletos/auditoria/interceptor/AuditInterceptor.java b/src/com/rjconsultores/ventaboletos/auditoria/interceptor/AuditInterceptor.java index 56bb487c0..e0cf930c2 100644 --- a/src/com/rjconsultores/ventaboletos/auditoria/interceptor/AuditInterceptor.java +++ b/src/com/rjconsultores/ventaboletos/auditoria/interceptor/AuditInterceptor.java @@ -28,6 +28,8 @@ public class AuditInterceptor extends EmptyInterceptor { private static final long serialVersionUID = 1L; private static final Logger log = LogManager.getLogger(AuditInterceptor.class); + + private static final String ACTIVO = "activo"; // Considera que o ADM sempre tenha o ID igual a 1 private Integer SISTEMA_ID = 1; @@ -132,7 +134,7 @@ public class AuditInterceptor extends EmptyInterceptor { if (AuditManager.getINSTANCE() != null && AuditManager.getINSTANCE().getAuditar() == null) { Criteria criteriaAuditar = session.createCriteria(Constante.class); criteriaAuditar.add(Restrictions.eq("nombconstante", "AUDITAR_SISTEMA")); - criteriaAuditar.add(Restrictions.eq("activo", Boolean.TRUE)); + criteriaAuditar.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); Constante constante = (Constante) criteriaAuditar.uniqueResult(); Boolean auditar = Boolean.FALSE; diff --git a/src/com/rjconsultores/ventaboletos/dao/CaixaContratoDAO.java b/src/com/rjconsultores/ventaboletos/dao/CaixaContratoDAO.java new file mode 100644 index 000000000..55868aafd --- /dev/null +++ b/src/com/rjconsultores/ventaboletos/dao/CaixaContratoDAO.java @@ -0,0 +1,13 @@ +package com.rjconsultores.ventaboletos.dao; + +import java.util.List; + +import com.rjconsultores.ventaboletos.entidad.CaixaContrato; + +public interface CaixaContratoDAO extends GenericDAO{ + + public List buscarExtratoContrato(Long contratoId); + + public CaixaContrato gravarMovimento(CaixaContrato caixa); + +} diff --git a/src/com/rjconsultores/ventaboletos/dao/GrupoContratoDAO.java b/src/com/rjconsultores/ventaboletos/dao/GrupoContratoDAO.java index 75163c055..8894af4d2 100644 --- a/src/com/rjconsultores/ventaboletos/dao/GrupoContratoDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/GrupoContratoDAO.java @@ -4,7 +4,7 @@ import java.util.List; import com.rjconsultores.ventaboletos.entidad.GrupoContrato; -public interface GrupoContratoDAO extends GenericDAO{ +public interface GrupoContratoDAO extends GenericDAO{ public List buscar(String nome); diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/AbastoBoletoHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/AbastoBoletoHibernateDAO.java index 96324b16a..7558c30e7 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/AbastoBoletoHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/AbastoBoletoHibernateDAO.java @@ -24,7 +24,7 @@ public class AbastoBoletoHibernateDAO extends GenericHibernateDAO buscaAbastoBoletoPorPuntoVenta(PuntoVenta puntoVenta) { - List abastos = findByCriteria(Restrictions.eq("puntoventa", puntoVenta), Restrictions.eq("activo", Boolean.TRUE)); + List abastos = findByCriteria(Restrictions.eq("puntoventa", puntoVenta), Restrictions.eq(ACTIVO, Boolean.TRUE)); return abastos; } } diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/AbastoCentralHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/AbastoCentralHibernateDAO.java index 4989d3e2a..509f9a237 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/AbastoCentralHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/AbastoCentralHibernateDAO.java @@ -34,7 +34,7 @@ public class AbastoCentralHibernateDAO extends GenericHibernateDAO obtenerTodos() { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); return (List)c.list(); } @@ -44,7 +44,7 @@ public class AbastoCentralHibernateDAO extends GenericHibernateDAO)c.list(); } @@ -115,7 +115,7 @@ public class AbastoCentralHibernateDAO extends GenericHibernateDAO obtenerBilhetesPorPuntoVenta(PuntoVenta puntoVentaBilhetes) { Criteria c = getSession().createCriteria(getPersistentClass()); c.add(Restrictions.eq("puntoventa", puntoVentaBilhetes)); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); return (List)c.list(); } @@ -137,7 +137,7 @@ public class AbastoCentralHibernateDAO extends GenericHibernateDAO obtenerTodos() { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); return (List)c.list(); } diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/AgruparParadaHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/AgruparParadaHibernateDAO.java index d666c7712..aaa1fb995 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/AgruparParadaHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/AgruparParadaHibernateDAO.java @@ -24,7 +24,7 @@ public class AgruparParadaHibernateDAO extends GenericHibernateDAO obtenerTodos() { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); c.addOrder(Order.asc("descAgrupamentoParada")); return c.list(); } @@ -32,7 +32,7 @@ public class AgruparParadaHibernateDAO extends GenericHibernateDAO buscar(String descparada) { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); c.add(Restrictions.eq("descAgrupamentoParada", descparada)); return c.list(); } @@ -40,7 +40,7 @@ public class AgruparParadaHibernateDAO extends GenericHibernateDAO buscarCVE(String cveAgrupamentoParada) { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); c.add(Restrictions.eq("cveAgrupamentoParada", cveAgrupamentoParada)); return c.list(); } diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/AidfEspecieHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/AidfEspecieHibernateDAO.java index 1e271125a..8816b9ff8 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/AidfEspecieHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/AidfEspecieHibernateDAO.java @@ -24,7 +24,7 @@ public class AidfEspecieHibernateDAO extends GenericHibernateDAO obtenerTodos() { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); return (List)c.list(); } diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/AidfHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/AidfHibernateDAO.java index 9c044a2c6..96f4c41b4 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/AidfHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/AidfHibernateDAO.java @@ -37,7 +37,7 @@ public class AidfHibernateDAO extends GenericHibernateDAO implements @Override public List obtenerTodos() { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); return (List) c.list(); } @@ -126,7 +126,7 @@ public class AidfHibernateDAO extends GenericHibernateDAO implements public List buscaAidfsPorEmpresas(List empresas) { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); c.add(Restrictions.in("empresa", empresas)); return (List) c.list(); @@ -136,7 +136,7 @@ public class AidfHibernateDAO extends GenericHibernateDAO implements public List buscaAidfsPorEmpresaAgencia(Empresa empresa, PuntoVenta pontoVenda) { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); c.add(Restrictions.eq("empresa", empresa)); c.add(Restrictions.eq("puntoVenta", pontoVenda)); diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/AidfTipoHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/AidfTipoHibernateDAO.java index 4df4ad6f4..7d6891af3 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/AidfTipoHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/AidfTipoHibernateDAO.java @@ -24,7 +24,7 @@ public class AidfTipoHibernateDAO extends GenericHibernateDAO @Override public List obtenerTodos() { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); return (List)c.list(); } diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/AjusteEventoExtraHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/AjusteEventoExtraHibernateDAO.java index e68a2ed52..5cd70fa1b 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/AjusteEventoExtraHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/AjusteEventoExtraHibernateDAO.java @@ -26,7 +26,7 @@ public class AjusteEventoExtraHibernateDAO extends @Override public List obtenerTodos() { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); return c.list(); } diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/AlertaCtrlHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/AlertaCtrlHibernateDAO.java index 6cc0a4c9f..39b6b17ab 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/AlertaCtrlHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/AlertaCtrlHibernateDAO.java @@ -35,7 +35,7 @@ public class AlertaCtrlHibernateDAO extends GenericHibernateDAO obtenerTodos() { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); return c.list(); } @@ -45,7 +45,7 @@ public class AlertaCtrlHibernateDAO extends GenericHibernateDAO buscarCorrida(Corrida corrida) { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); c.add(Restrictions.eq("corrida", corrida)); diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/AliasClasseHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/AliasClasseHibernateDAO.java index 37bf30d86..761aaeccc 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/AliasClasseHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/AliasClasseHibernateDAO.java @@ -27,7 +27,7 @@ public class AliasClasseHibernateDAO extends GenericHibernateDAO buscar(Integer classe, Integer alias, Integer orgaoConcedente) { Criteria c = makeCriteria(); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); if( classe != null ) { c.add(Restrictions.eq("classe.claseservicioId",classe)); } diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/AliasServicoHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/AliasServicoHibernateDAO.java index 9e869c65e..91a190ff6 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/AliasServicoHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/AliasServicoHibernateDAO.java @@ -33,7 +33,7 @@ public class AliasServicoHibernateDAO extends GenericHibernateDAO buscarAliasSemCorrida(Integer origenId, Integer destinoId, Integer rutaId) { Criteria c = makeCriteria(); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); c.add(Restrictions.eq("origen.paradaId",origenId)); c.add(Restrictions.eq("destino.paradaId",destinoId)); c.add(Restrictions.eq("ruta.rutaId",rutaId)); @@ -45,7 +45,7 @@ public class AliasServicoHibernateDAO extends GenericHibernateDAO buscar(Integer origenId, Integer destinoId, Integer rutaId, Integer corridaId) { Criteria c = makeCriteria(); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); c.add(Restrictions.eq("origen.paradaId",origenId)); c.add(Restrictions.eq("destino.paradaId",destinoId)); c.add(Restrictions.eq("ruta.rutaId",rutaId)); @@ -127,7 +127,7 @@ public class AliasServicoHibernateDAO extends GenericHibernateDAO @Override public List obtenerTodos() { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); return c.list(); } public List buscar(String descarticulo) { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); c.add(Restrictions.eq("descarticulo", descarticulo)); diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/AsientoExclusivoHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/AsientoExclusivoHibernateDAO.java index 06ea00bae..1ad7cb9be 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/AsientoExclusivoHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/AsientoExclusivoHibernateDAO.java @@ -34,7 +34,7 @@ public class AsientoExclusivoHibernateDAO extends GenericHibernateDAO obtenerTodos() { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); return c.list(); } diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/AsistenciaDeViajeEmpresaHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/AsistenciaDeViajeEmpresaHibernateDAO.java index 6cd5e945b..46ca1e934 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/AsistenciaDeViajeEmpresaHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/AsistenciaDeViajeEmpresaHibernateDAO.java @@ -23,14 +23,14 @@ public class AsistenciaDeViajeEmpresaHibernateDAO extends GenericHibernateDAO obtenerTodos() { Criteria c = makeCriteria(); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); return c.list(); } public boolean existe(Empresa empresa){ Criteria c = makeCriteria(); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); c.add(Restrictions.eq("empresa", empresa)); return !c.list().isEmpty(); } diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/AutobusDocHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/AutobusDocHibernateDAO.java index 1fbeb96f5..e25de2ee8 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/AutobusDocHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/AutobusDocHibernateDAO.java @@ -25,7 +25,7 @@ implements AutobusDocDAO { @Override public List obtenerTodos() { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); return c.list(); } @@ -33,7 +33,7 @@ implements AutobusDocDAO { @Override public List obtenerPorAutobus(Autobus autobus) { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); c.add(Restrictions.eq("autobus", autobus)); return c.list(); diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/AutobusHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/AutobusHibernateDAO.java index 5127bd095..5efb97651 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/AutobusHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/AutobusHibernateDAO.java @@ -32,7 +32,7 @@ public class AutobusHibernateDAO extends GenericHibernateDAO @Override public List obtenerTodos() { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); c.addOrder(Order.asc("numautobus")); return c.list(); @@ -40,7 +40,7 @@ public class AutobusHibernateDAO extends GenericHibernateDAO public List buscar(String numautobus, DiagramaAutobus diagramaAutobus) { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); c.add(Restrictions.eq("numautobus", numautobus)); c.add(Restrictions.eq("diagramaAutobus", diagramaAutobus)); diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/AutorizacionHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/AutorizacionHibernateDAO.java index 98dd66b85..82c920857 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/AutorizacionHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/AutorizacionHibernateDAO.java @@ -33,7 +33,7 @@ public class AutorizacionHibernateDAO extends GenericHibernateDAO obtenerTodos() { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); c.addOrder(Order.asc("nombautorizacion")); return c.list(); diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/AutorizacionPerfilHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/AutorizacionPerfilHibernateDAO.java index 3ff50cfdd..bd687f9d7 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/AutorizacionPerfilHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/AutorizacionPerfilHibernateDAO.java @@ -31,7 +31,7 @@ public class AutorizacionPerfilHibernateDAO extends GenericHibernateDAO buscar(Autorizacion autorizacion, Perfil perfil) { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); c.add(Restrictions.eq("autorizacion", autorizacion)); c.add(Restrictions.eq("perfil", perfil)); diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/BancoHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/BancoHibernateDAO.java index 9ee11427c..65ec241d2 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/BancoHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/BancoHibernateDAO.java @@ -30,7 +30,7 @@ public class BancoHibernateDAO extends GenericHibernateDAO @Override public List obtenerTodos() { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); return c.list(); } @@ -38,7 +38,7 @@ public class BancoHibernateDAO extends GenericHibernateDAO @Override public List buscar(Banco banco) { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); c.add(Restrictions.eq("puntoVenta", banco.getPuntoVenta())); c.add(Restrictions.eq("empresa", banco.getEmpresa())); c.add(Restrictions.eq("moneda", banco.getMoneda())); diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/BoletoHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/BoletoHibernateDAO.java index 41b7f1fc4..ae6f13ece 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/BoletoHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/BoletoHibernateDAO.java @@ -65,7 +65,7 @@ public class BoletoHibernateDAO extends GenericHibernateDAO implem public Boleto buscarPeloImeiDoDispositivo(String imei) { Criteria c = getSession().createCriteria(getPersistentClass()); c.add(Restrictions.eq("imeiDispositivoEmbarcada", imei)); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); c.addOrder(Order.desc("fechorventa")); c.setFirstResult(0); c.setMaxResults(1); diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/CaixaContratoHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/CaixaContratoHibernateDAO.java new file mode 100644 index 000000000..765afac2c --- /dev/null +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/CaixaContratoHibernateDAO.java @@ -0,0 +1,45 @@ +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; + +import com.rjconsultores.ventaboletos.dao.CaixaContratoDAO; +import com.rjconsultores.ventaboletos.entidad.CaixaContrato; + +@SuppressWarnings("unchecked") +@Repository("caixaContratoDAO") +public class CaixaContratoHibernateDAO extends GenericHibernateDAO implements CaixaContratoDAO { + + @Autowired + public CaixaContratoHibernateDAO(@Qualifier("sessionFactory") SessionFactory factory) { + setSessionFactory(factory); + } + + @Override + public List obtenerTodos() { + Criteria c = getSession().createCriteria(getPersistentClass()); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); + + return c.list(); + } + + @Override + public List buscarExtratoContrato(Long contratoId) { + Criteria c = getSession().createCriteria(getPersistentClass()); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); + c.add(Restrictions.eq("contratoId", contratoId)); + + return c.list(); + } + + @Override + public CaixaContrato gravarMovimento(CaixaContrato caixa) { + return suscribir(caixa); + } +} diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/CancelacionCtrlHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/CancelacionCtrlHibernateDAO.java index a2b55ecb7..873a830b3 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/CancelacionCtrlHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/CancelacionCtrlHibernateDAO.java @@ -34,7 +34,7 @@ public class CancelacionCtrlHibernateDAO extends GenericHibernateDAO obtenerTodos() { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); return c.list(); } @@ -43,7 +43,7 @@ public class CancelacionCtrlHibernateDAO extends GenericHibernateDAO obtenerTodos() { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); return c.list(); } @@ -33,7 +33,7 @@ public class CasetaPeajeExcepcionHibernateDAO extends GenericHibernateDAO obtenerPorCasetaPeaje(CasetaPeaje caseta) { Criteria c = getSession().createCriteria(getPersistentClass()); c.add(Restrictions.eq("casetaPeaje", caseta)); - c.add(Restrictions.eq("activo", true)).setResultTransformer(Criteria.DISTINCT_ROOT_ENTITY); + c.add(Restrictions.eq(ACTIVO, true)).setResultTransformer(Criteria.DISTINCT_ROOT_ENTITY); return c.list(); } diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/CasetaPeajeHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/CasetaPeajeHibernateDAO.java index c3e6d69fd..751eb536f 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/CasetaPeajeHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/CasetaPeajeHibernateDAO.java @@ -26,13 +26,13 @@ public class CasetaPeajeHibernateDAO extends GenericHibernateDAO obtenerTodos() { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); return (List) c.list(); } public List buscarTodosOrdenadoPorDescricao() { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); c.addOrder(Order.asc("desccaseta")); c.setResultTransformer(Criteria.DISTINCT_ROOT_ENTITY); return (List) c.list(); @@ -41,7 +41,7 @@ public class CasetaPeajeHibernateDAO extends GenericHibernateDAO buscar(String casetaPeajeDesc) { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); c.add(Restrictions.eq("desccaseta", casetaPeajeDesc)); return c.list(); } diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/CategoriaClaseHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/CategoriaClaseHibernateDAO.java index 199636b48..4b34e55e1 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/CategoriaClaseHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/CategoriaClaseHibernateDAO.java @@ -38,7 +38,7 @@ public class CategoriaClaseHibernateDAO extends GenericHibernateDAO obtenerTodos() { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); return c.list(); } diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/CategoriaCorridaHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/CategoriaCorridaHibernateDAO.java index b20b81a80..8cbd94ffd 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/CategoriaCorridaHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/CategoriaCorridaHibernateDAO.java @@ -38,7 +38,7 @@ public class CategoriaCorridaHibernateDAO extends GenericHibernateDAO obtenerTodos() { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); return c.list(); } diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/CategoriaCtrlHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/CategoriaCtrlHibernateDAO.java index 4ec3086f9..047e918d4 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/CategoriaCtrlHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/CategoriaCtrlHibernateDAO.java @@ -30,7 +30,7 @@ public class CategoriaCtrlHibernateDAO extends GenericHibernateDAO obtenerTodos() { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); return c.list(); } diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/CategoriaDescuentoHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/CategoriaDescuentoHibernateDAO.java index a861778ec..c3e3702d1 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/CategoriaDescuentoHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/CategoriaDescuentoHibernateDAO.java @@ -35,7 +35,7 @@ public class CategoriaDescuentoHibernateDAO @Override public List obtenerTodos() { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); return c.list(); } @@ -45,7 +45,7 @@ public class CategoriaDescuentoHibernateDAO Criteria c = getSession().createCriteria(getPersistentClass()) .createAlias("categoriaCtrl", "ctrl") .createAlias("ctrl.empresa", "e") - .add(Restrictions.eq("activo", Boolean.TRUE)) + .add(Restrictions.eq(ACTIVO, Boolean.TRUE)) .add(Restrictions.eq("e.empresaId", empresaId)) .add(Restrictions.eq("categoria.categoriaId", categoriaId)); c.setMaxResults(1); diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/CategoriaHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/CategoriaHibernateDAO.java index 70f523905..58f91991c 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/CategoriaHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/CategoriaHibernateDAO.java @@ -35,7 +35,7 @@ public class CategoriaHibernateDAO extends GenericHibernateDAO obtenerTodos() { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); c.addOrder(Order.asc("desccategoria")); return c.list(); @@ -43,7 +43,7 @@ public class CategoriaHibernateDAO extends GenericHibernateDAO buscar(String desccategoria) { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); c.add(Restrictions.eq("desccategoria", desccategoria)); return c.list(); @@ -52,7 +52,7 @@ public class CategoriaHibernateDAO extends GenericHibernateDAO buscarCategoriaPesquisada(String desccategoria) { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + 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/CategoriaMarcaHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/CategoriaMarcaHibernateDAO.java index e8cbc17d6..b45cdc9e3 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/CategoriaMarcaHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/CategoriaMarcaHibernateDAO.java @@ -38,7 +38,7 @@ public class CategoriaMarcaHibernateDAO extends GenericHibernateDAO obtenerTodos() { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); return c.list(); } diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/CategoriaMercadoHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/CategoriaMercadoHibernateDAO.java index 84ad8a3c6..3ddbdc053 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/CategoriaMercadoHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/CategoriaMercadoHibernateDAO.java @@ -39,7 +39,7 @@ public class CategoriaMercadoHibernateDAO @Override public List obtenerTodos() { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); return c.list(); } diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/CategoriaOrgaoHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/CategoriaOrgaoHibernateDAO.java index 392c2eea9..2eb3d5973 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/CategoriaOrgaoHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/CategoriaOrgaoHibernateDAO.java @@ -37,7 +37,7 @@ public class CategoriaOrgaoHibernateDAO extends GenericHibernateDAO obtenerTodos() { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); return c.list(); } diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/CategoriaPeriodoHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/CategoriaPeriodoHibernateDAO.java index 8c700c76b..f7388ff5d 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/CategoriaPeriodoHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/CategoriaPeriodoHibernateDAO.java @@ -35,7 +35,7 @@ public class CategoriaPeriodoHibernateDAO @Override public List obtenerTodos() { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); return c.list(); } @@ -54,7 +54,7 @@ public class CategoriaPeriodoHibernateDAO fecfinvigencia.set(Calendar.SECOND, 0); Criteria c = this.getSession().createCriteria(CategoriaPeriodo.class); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); c.add(Restrictions.ge("fecfin", feciniciovigencia.getTime())); c.add(Restrictions.le("fecinicio", fecfinvigencia.getTime())); c.add(Restrictions.eq("categoriaDescuento", cPeriodo.getCategoriaDescuento())); @@ -66,7 +66,7 @@ public class CategoriaPeriodoHibernateDAO @Override public List obtenerPorCategoriaDescuento(CategoriaDescuento categoriaDescuento) { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); c.add(Restrictions.eq("categoriaDescuento", categoriaDescuento)); return c.list(); diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/CategoriaRutaExcecaoHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/CategoriaRutaExcecaoHibernateDAO.java index 3632aa0dd..cde8d6f29 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/CategoriaRutaExcecaoHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/CategoriaRutaExcecaoHibernateDAO.java @@ -36,7 +36,7 @@ public class CategoriaRutaExcecaoHibernateDAO extends GenericHibernateDAO obtenerTodos() { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); return c.list(); } diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/CategoriaRutaHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/CategoriaRutaHibernateDAO.java index f5ebdb9b6..ca36cdb7b 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/CategoriaRutaHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/CategoriaRutaHibernateDAO.java @@ -36,7 +36,7 @@ public class CategoriaRutaHibernateDAO extends GenericHibernateDAO obtenerTodos() { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); return c.list(); } diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/CategoriaTipoPtoVtaHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/CategoriaTipoPtoVtaHibernateDAO.java index 5cc9c0d84..0095f0629 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/CategoriaTipoPtoVtaHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/CategoriaTipoPtoVtaHibernateDAO.java @@ -32,14 +32,14 @@ public class CategoriaTipoPtoVtaHibernateDAO extends GenericHibernateDAO obtenerTodos() { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); return c.list(); } public List buscarPorPuntoVenta(TipoPuntoVenta tipoPuntoVenta) { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); c.add(Restrictions.eq("tipoPuntoVenta", tipoPuntoVenta)); return c.list(); diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/CiudadHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/CiudadHibernateDAO.java index 40a94f76b..80dc96f63 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/CiudadHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/CiudadHibernateDAO.java @@ -34,7 +34,7 @@ public class CiudadHibernateDAO extends GenericHibernateDAO @Override public List obtenerTodos() { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); c.addOrder(Order.asc("nombciudad")); return c.list(); @@ -42,7 +42,7 @@ public class CiudadHibernateDAO extends GenericHibernateDAO public List buscar(String nombciudad, Estado estado, Plaza plaza) { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); c.add(Restrictions.eq("nombciudad", nombciudad)); c.add(Restrictions.eq("estado", estado)); @@ -51,7 +51,7 @@ public class CiudadHibernateDAO extends GenericHibernateDAO public List buscaLike(String strCiudad) { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); c.add(Restrictions.like("nombciudad", strCiudad, MatchMode.START)); c.addOrder(Order.asc("nombciudad")); @@ -60,7 +60,7 @@ public class CiudadHibernateDAO extends GenericHibernateDAO @Override public List buscarPorEstado(Estado estado) { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); c.add(Restrictions.eq("estado", estado)); c.addOrder(Order.asc("nombciudad")); @@ -70,7 +70,7 @@ public class CiudadHibernateDAO extends GenericHibernateDAO @Override public List buscaCodMun(Integer codMun, Estado estado) { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); c.add(Restrictions.eq("codmunicipio", codMun)); c.add(Restrictions.eq("estado", estado)); diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/ClaseservicioEquivalenciaHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/ClaseservicioEquivalenciaHibernateDAO.java index 4276dc1b3..2a7de7ac2 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/ClaseservicioEquivalenciaHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/ClaseservicioEquivalenciaHibernateDAO.java @@ -35,7 +35,7 @@ public class ClaseservicioEquivalenciaHibernateDAO c.add(Restrictions.eq("claseservicio", claseServicio)); c.add(Restrictions.eq("comisionistaExterno", comisionistaExterno)); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); return c.list(); } @@ -45,7 +45,7 @@ public class ClaseservicioEquivalenciaHibernateDAO c.add(Restrictions.eq("equivalenciaId", claseServicioEquivalencia.getEquivalenciaId())); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); return c.list(); } diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/ClasseServicoHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/ClasseServicoHibernateDAO.java index 23b4880ce..257a9fa1c 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/ClasseServicoHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/ClasseServicoHibernateDAO.java @@ -35,7 +35,7 @@ public class ClasseServicoHibernateDAO extends GenericHibernateDAO obtenerTodos() { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); c.addOrder(Order.asc("descclase")); return c.list(); @@ -60,7 +60,7 @@ public class ClasseServicoHibernateDAO extends GenericHibernateDAO buscarPorNome(Integer idClaseServicio, String nomeClaseServicio) { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); c.add(Restrictions.eq("descclase", nomeClaseServicio)); if (idClaseServicio != null) { @@ -75,7 +75,7 @@ public class ClasseServicoHibernateDAO extends GenericHibernateDAO buscarListaPorIds(List claseIds) { Criteria c = this.makeCriteria(); c.add(Restrictions.in("claseservicioId", claseIds)); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); return c.list(); } diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/ClienteCorporativoHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/ClienteCorporativoHibernateDAO.java index a114fcfa4..9f047e427 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/ClienteCorporativoHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/ClienteCorporativoHibernateDAO.java @@ -28,7 +28,7 @@ public class ClienteCorporativoHibernateDAO extends GenericHibernateDAO buscar(Integer classe, Integer alias, Integer orgaoConcedente) { Criteria c = makeCriteria(); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); if( classe != null ) { c.add(Restrictions.eq("classe.claseservicioId",classe)); } @@ -70,7 +70,7 @@ public class ClienteCorporativoHibernateDAO extends GenericHibernateDAO buscaLike(String nome) { Criteria c = makeCriteria(); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); if( nome != null ) { c.add(Restrictions.like("nomeClienteCorp", nome, MatchMode.ANYWHERE)); diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/ClienteCursoHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/ClienteCursoHibernateDAO.java index 3bf3d5d46..a117e7ec6 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/ClienteCursoHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/ClienteCursoHibernateDAO.java @@ -26,14 +26,14 @@ public class ClienteCursoHibernateDAO extends GenericHibernateDAO obtenerTodos() { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); return c.list(); } @Override public ClienteCurso buscarClienteCurso(Cliente cliente, Curso curso) { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); c.add(Restrictions.eq("cliente", cliente)); c.add(Restrictions.eq("curso", curso)); diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/ClienteDescuentoHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/ClienteDescuentoHibernateDAO.java index f6c4fcc58..fa6b714d1 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/ClienteDescuentoHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/ClienteDescuentoHibernateDAO.java @@ -24,7 +24,7 @@ implements ClienteDescuentoDAO { public List buscar(Cliente cliente) { Criteria c = getSession().createCriteria(getPersistentClass()); - //c.add(Restrictions.eq("activo", 1)); + //c.add(Restrictions.eq(ACTIVO, 1)); c.add(Restrictions.eq("cliente", cliente)); return c.list(); } diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/ClienteDireccionHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/ClienteDireccionHibernateDAO.java index 19fd4bd9e..ce634845d 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/ClienteDireccionHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/ClienteDireccionHibernateDAO.java @@ -30,7 +30,7 @@ public class ClienteDireccionHibernateDAO extends GenericHibernateDAO obtenerTodos() { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); c.addOrder(Order.asc("id")); return c.list(); @@ -40,14 +40,14 @@ public class ClienteDireccionHibernateDAO extends GenericHibernateDAO buscar(Cliente cliente){ Criteria c = getSession().createCriteria(getPersistentClass()); - //c.add(Restrictions.eq("activo", Boolean.TRUE)); + //c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); c.add(Restrictions.eq("clienteId", cliente)); return c.list(); } diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/CoeficienteTarifaHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/CoeficienteTarifaHibernateDAO.java index d03c9a6ff..01cff14ff 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/CoeficienteTarifaHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/CoeficienteTarifaHibernateDAO.java @@ -26,7 +26,7 @@ public class CoeficienteTarifaHibernateDAO extends GenericHibernateDAO obtenerTodos() { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); c.addOrder(Order.asc("descCoeficiente")); return c.list(); @@ -35,7 +35,7 @@ public class CoeficienteTarifaHibernateDAO extends GenericHibernateDAO buscar(String nomb) { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); c.add(Restrictions.ilike("descCoeficiente", nomb, MatchMode.START)); c.addOrder(Order.asc("descCoeficiente")); diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/ColoniaHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/ColoniaHibernateDAO.java index 0391cd98c..dde99d154 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/ColoniaHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/ColoniaHibernateDAO.java @@ -35,7 +35,7 @@ public class ColoniaHibernateDAO extends GenericHibernateDAO @Override public List obtenerTodos() { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); c.addOrder(Order.asc("desccolonia")); return c.list(); @@ -43,7 +43,7 @@ public class ColoniaHibernateDAO extends GenericHibernateDAO public List buscar(String desccolonia) { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); c.add(Restrictions.eq("desccolonia", desccolonia)); return c.list(); @@ -59,7 +59,7 @@ public class ColoniaHibernateDAO extends GenericHibernateDAO @Override public List buscaLike(String desccolonia) { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); c.add(Restrictions.like("desccolonia", desccolonia, MatchMode.START)); c.addOrder(Order.asc("desccolonia")); diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/ComisionistaExternoHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/ComisionistaExternoHibernateDAO.java index 8a3adcb70..5c2fe9dae 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/ComisionistaExternoHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/ComisionistaExternoHibernateDAO.java @@ -32,7 +32,7 @@ public class ComisionistaExternoHibernateDAO extends GenericHibernateDAO obtenerTodos() { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); c.addOrder(Order.asc("desccomisionista")); return c.list(); @@ -40,7 +40,7 @@ public class ComisionistaExternoHibernateDAO extends GenericHibernateDAO buscar(String desccomisionista) { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); c.add(Restrictions.eq("desccomisionista", desccomisionista)); c.addOrder(Order.asc("desccomisionista")); diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/CompaniaBancariaHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/CompaniaBancariaHibernateDAO.java index 62c742f20..7929e40c1 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/CompaniaBancariaHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/CompaniaBancariaHibernateDAO.java @@ -29,7 +29,7 @@ public class CompaniaBancariaHibernateDAO extends GenericHibernateDAO buscar(CompaniaBancaria companiaBancaria) { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", true)); + c.add(Restrictions.eq(ACTIVO, true)); c.add(Restrictions.eq("cvecompania", companiaBancaria.getCvecompania())); c.add(Restrictions.eq("cvesucursal", companiaBancaria.getCvesucursal())); diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/ConductorHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/ConductorHibernateDAO.java index cfa9112bf..0d83880d0 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/ConductorHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/ConductorHibernateDAO.java @@ -32,7 +32,7 @@ public class ConductorHibernateDAO extends GenericHibernateDAO obtenerTodos() { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); return c.list(); } @@ -46,7 +46,7 @@ public class ConductorHibernateDAO extends GenericHibernateDAO obtenerTodos() { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); return c.list(); } @@ -33,7 +33,7 @@ public class ConexionConfHibernateDAO extends GenericHibernateDAO buscarPorConexionCtrl(ConexionCtrl conexionCtrl) { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); c.add(Restrictions.eq("conexionCtrl", conexionCtrl)); return c.list(); diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/ConexionDescuentoHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/ConexionDescuentoHibernateDAO.java index 8dd0e08c5..277be013a 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/ConexionDescuentoHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/ConexionDescuentoHibernateDAO.java @@ -26,7 +26,7 @@ implements ConexionDescuentoDAO { public List bucarPorConexion(Long conexionId) { Criteria c = getSession().createCriteria(getPersistentClass()); c.add(Restrictions.eq("conexion.conexionId", conexionId)); - c.add(Restrictions.eq("activo", true)); + c.add(Restrictions.eq(ACTIVO, true)); return c.list(); } @@ -35,7 +35,7 @@ implements ConexionDescuentoDAO { public List bucarPorConexionInativos(Long conexionId) { Criteria c = getSession().createCriteria(getPersistentClass()); c.add(Restrictions.eq("conexion.conexionId", conexionId)); - c.add(Restrictions.eq("activo", false)); + c.add(Restrictions.eq(ACTIVO, false)); return c.list(); } diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/ConexionExcepcionHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/ConexionExcepcionHibernateDAO.java index 0c58ef00c..95855a01d 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/ConexionExcepcionHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/ConexionExcepcionHibernateDAO.java @@ -25,7 +25,7 @@ public class ConexionExcepcionHibernateDAO extends GenericHibernateDAO obtenerConexionExcepcionsActivo(Long conexionctrlId) { Criteria c = getSession().createCriteria(getPersistentClass()); c.add(Restrictions.eq("conexionctrlId", conexionctrlId)); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); return c.list(); } } diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/ConexionExcepcionRutaHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/ConexionExcepcionRutaHibernateDAO.java index 1805fe61c..6394358a6 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/ConexionExcepcionRutaHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/ConexionExcepcionRutaHibernateDAO.java @@ -25,7 +25,7 @@ public class ConexionExcepcionRutaHibernateDAO extends GenericHibernateDAO obtenerConexionExcepcionsActivo(Long conexionctrlId) { Criteria c = getSession().createCriteria(getPersistentClass()); c.add(Restrictions.eq("conexionctrlId", conexionctrlId)); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); return c.list(); } } diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/ConexionHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/ConexionHibernateDAO.java index e2bec0313..048e386d1 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/ConexionHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/ConexionHibernateDAO.java @@ -343,7 +343,7 @@ public class ConexionHibernateDAO extends GenericHibernateDAO public List buscarPorConexionCtrl(Long conexionCtrlId) { Criteria c = getSession().createCriteria(getPersistentClass()); c.add(Restrictions.eq("conexionctrlId", conexionCtrlId)); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); c.addOrder(Order.asc("numgrupo")); c.addOrder(Order.asc("numsecuencia")); @@ -355,7 +355,7 @@ public class ConexionHibernateDAO extends GenericHibernateDAO Criteria c = getSession().createCriteria(getPersistentClass()); c.add(Restrictions.eq("conexionRutaTramoId", conexionRutaTramoId)); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); return (Conexion) c.uniqueResult(); } } diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/ConexionRutaConfHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/ConexionRutaConfHibernateDAO.java index a870d7e78..ddb6e2826 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/ConexionRutaConfHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/ConexionRutaConfHibernateDAO.java @@ -38,7 +38,7 @@ public class ConexionRutaConfHibernateDAO extends GenericHibernateDAO buscarPorDescricao(String descricao) { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); c.add(Restrictions.ilike("descricao", descricao, MatchMode.ANYWHERE)); return c.list(); @@ -47,7 +47,7 @@ public class ConexionRutaConfHibernateDAO extends GenericHibernateDAO obtenerTodosActivo() { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); return c.list(); } @@ -329,7 +329,7 @@ public class ConexionRutaConfHibernateDAO extends GenericHibernateDAO buscarPorConexionConf(ConexionRutaConf conexionRutaConf) { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); c.add(Restrictions.eq("conexionRutaConf", conexionRutaConf)); return c.list(); } diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/ConexionRutaExcepcionTipoPtoVtaHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/ConexionRutaExcepcionTipoPtoVtaHibernateDAO.java index 440b65fbf..e9181c98e 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/ConexionRutaExcepcionTipoPtoVtaHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/ConexionRutaExcepcionTipoPtoVtaHibernateDAO.java @@ -25,7 +25,7 @@ public class ConexionRutaExcepcionTipoPtoVtaHibernateDAO extends GenericHibernat public List buscarPorConexionConf(ConexionRutaConf conexionRutaConf) { Criteria c = getSession().createCriteria(getPersistentClass()); c.add(Restrictions.eq("conexionRutaConf", conexionRutaConf)); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); return c.list(); } diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/ConexionRutaLocalidadeRemovidaHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/ConexionRutaLocalidadeRemovidaHibernateDAO.java index de553b5cf..08a13f687 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/ConexionRutaLocalidadeRemovidaHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/ConexionRutaLocalidadeRemovidaHibernateDAO.java @@ -42,7 +42,7 @@ public class ConexionRutaLocalidadeRemovidaHibernateDAO extends GenericHibernate try { Criteria c = this.makeCriteria(); c.add(Restrictions.eq("paradaId", parada.getParadaId().longValue())); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); ConexionRutaLocalidadeRemovida conexionRutaLocalidadeRemovida = (ConexionRutaLocalidadeRemovida) c.uniqueResult(); borrar(conexionRutaLocalidadeRemovida); } catch (Exception e) { @@ -57,7 +57,7 @@ public class ConexionRutaLocalidadeRemovidaHibernateDAO extends GenericHibernate Criteria c = this.makeCriteria(); c.add(Restrictions.eq("conexionrutaconfId", conexionrutaconfId)); c.add(Restrictions.eq("paradaId", parada.getParadaId().longValue())); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); List conexionRutaLocalidadeRemovidaList = c.list(); ConexionRutaLocalidadeRemovida conexionRutaLocalidadeRemovida =conexionRutaLocalidadeRemovidaList != null && conexionRutaLocalidadeRemovidaList.size() > 0 ? conexionRutaLocalidadeRemovidaList.get(0) : null; if(conexionRutaLocalidadeRemovida != null) { @@ -87,7 +87,7 @@ public class ConexionRutaLocalidadeRemovidaHibernateDAO extends GenericHibernate try { Criteria c = this.makeCriteria(); c.add(Restrictions.eq("paradaId", paradaId)); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); List conexionRutaLocalidadeRemovidaList = c.list(); return conexionRutaLocalidadeRemovidaList != null && conexionRutaLocalidadeRemovidaList.size() > 0 ? conexionRutaLocalidadeRemovidaList.get(0) : null; } catch (Exception e) { @@ -101,7 +101,7 @@ public class ConexionRutaLocalidadeRemovidaHibernateDAO extends GenericHibernate try { Criteria c = this.makeCriteria(); c.add(Restrictions.in("paradaId", paradaIdList)); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); List conexionRutaLocalidadeRemovidaList = c.list(); return conexionRutaLocalidadeRemovidaList; } catch (Exception e) { @@ -119,7 +119,7 @@ public class ConexionRutaLocalidadeRemovidaHibernateDAO extends GenericHibernate Criteria c = this.makeCriteria(); c.add(Restrictions.eq("conexionRutaConfId", conexionRutaConfId)); c.add(Restrictions.eq("paradaId", paradaId)); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); List conexionRutaLocalidadeRemovidaList = c.list(); return conexionRutaLocalidadeRemovidaList != null && conexionRutaLocalidadeRemovidaList.size() > 0 ? conexionRutaLocalidadeRemovidaList.get(0) : null; } catch (Exception e) { @@ -134,7 +134,7 @@ public class ConexionRutaLocalidadeRemovidaHibernateDAO extends GenericHibernate Criteria c = this.makeCriteria(); c.add(Restrictions.eq("conexionRutaConfId", conexionRutaConfId)); c.add(Restrictions.in("paradaId", paradaIdList)); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); List conexionRutaLocalidadeRemovidaList = c.list(); return conexionRutaLocalidadeRemovidaList; } catch (Exception e) { diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/ConexionRutaRestricaoPtoVtaHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/ConexionRutaRestricaoPtoVtaHibernateDAO.java index 8f58a1489..ed0d6b5e0 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/ConexionRutaRestricaoPtoVtaHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/ConexionRutaRestricaoPtoVtaHibernateDAO.java @@ -26,7 +26,7 @@ public class ConexionRutaRestricaoPtoVtaHibernateDAO extends GenericHibernateDAO public List buscarPorConexionConf(ConexionRutaConf conexionRutaConf) { Criteria c = getSession().createCriteria(getPersistentClass()); c.add(Restrictions.eq("conexionRutaConf", conexionRutaConf)); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); return c.list(); } diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/ConexionRutaTramoCtrlHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/ConexionRutaTramoCtrlHibernateDAO.java index 636bf16ab..e0d76b9b3 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/ConexionRutaTramoCtrlHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/ConexionRutaTramoCtrlHibernateDAO.java @@ -57,7 +57,7 @@ public class ConexionRutaTramoCtrlHibernateDAO extends GenericHibernateDAO buscarPorConexionRutaCtrl(ConexionRutaCtrl conexionRutaCtrl, Integer rutaId) { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); c.add(Restrictions.eq("conexionRutaCtrl", conexionRutaCtrl)); c.add(Restrictions.eq("ruta.rutaId", rutaId)); diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/ConfComprovantePassagemHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/ConfComprovantePassagemHibernateDAO.java index 0c0386ad5..372aa6113 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/ConfComprovantePassagemHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/ConfComprovantePassagemHibernateDAO.java @@ -21,7 +21,7 @@ public class ConfComprovantePassagemHibernateDAO extends GenericHibernateDAO buscarConfContratoPorPuntoVenta(PuntoVenta puntoVenta) { - List abastos = findByCriteria(Restrictions.eq("puntoventa", puntoVenta), Restrictions.eq("activo", Boolean.TRUE)); + List abastos = findByCriteria(Restrictions.eq("puntoventa", puntoVenta), Restrictions.eq(ACTIVO, Boolean.TRUE)); return abastos; } diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/ConfRestricaoVendaWebHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/ConfRestricaoVendaWebHibernateDAO.java index 7e5ef1b9f..abb33750f 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/ConfRestricaoVendaWebHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/ConfRestricaoVendaWebHibernateDAO.java @@ -26,7 +26,7 @@ public class ConfRestricaoVendaWebHibernateDAO extends GenericHibernateDAO obtenerTodos() { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); return c.list(); } diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/ConfTotemHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/ConfTotemHibernateDAO.java index 7717f9e1d..b589dd224 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/ConfTotemHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/ConfTotemHibernateDAO.java @@ -28,14 +28,14 @@ public class ConfTotemHibernateDAO extends GenericHibernateDAO obtenerTodos() { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); return c.list(); } public ConfTotem buscar(String chave) { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); c.add(Restrictions.ilike("chave", chave)); diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/ConfTotemVentaRapidaHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/ConfTotemVentaRapidaHibernateDAO.java index b14ad714e..611c2f17b 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/ConfTotemVentaRapidaHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/ConfTotemVentaRapidaHibernateDAO.java @@ -31,7 +31,7 @@ public class ConfTotemVentaRapidaHibernateDAO extends GenericHibernateDAO obtenerTodos() { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); return c.list(); } } diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/ConfigRestriccionPagoHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/ConfigRestriccionPagoHibernateDAO.java index ee6042804..69a060a5f 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/ConfigRestriccionPagoHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/ConfigRestriccionPagoHibernateDAO.java @@ -39,7 +39,7 @@ public class ConfigRestriccionPagoHibernateDAO @Override public List obtenerTodos() { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); return c.list(); } @@ -47,7 +47,7 @@ public class ConfigRestriccionPagoHibernateDAO public List buscar(FormaPago formaPago, RestriccionPago restriccionPago, Empresa empresa) { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); c.add(Restrictions.eq("restriccion", restriccionPago)); c.add(Restrictions.eq("formaPago", formaPago)); @@ -67,7 +67,7 @@ public class ConfigRestriccionPagoHibernateDAO public Map buscar(FormaPago formaPago) { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); c.add(Restrictions.eq("formaPago", formaPago)); Map mapRespuesta = new LinkedHashMap(); diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/ConstanteHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/ConstanteHibernateDAO.java index cd48e1c1c..2e43cb7a2 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/ConstanteHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/ConstanteHibernateDAO.java @@ -34,7 +34,7 @@ public class ConstanteHibernateDAO extends GenericHibernateDAO obtenerTodos() { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); c.addOrder(Order.asc("nombconstante")); return c.list(); @@ -42,7 +42,7 @@ public class ConstanteHibernateDAO extends GenericHibernateDAO buscar(String nombconstante) { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); c.add(Restrictions.eq("nombconstante", nombconstante)); @@ -60,7 +60,7 @@ public class ConstanteHibernateDAO extends GenericHibernateDAO buscarPorNomeConstanteLike(String nombconstante) { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); c.add(Restrictions.ilike("nombconstante", "%" + nombconstante + "%")); diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/ContaMDHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/ContaMDHibernateDAO.java index db5e09c2d..3f818738e 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/ContaMDHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/ContaMDHibernateDAO.java @@ -25,7 +25,7 @@ public class ContaMDHibernateDAO extends GenericHibernateDAO @Override public List obtenerTodos() { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); return c.list(); } @@ -34,7 +34,7 @@ public class ContaMDHibernateDAO extends GenericHibernateDAO public Boolean existeConta(ContaMD conta) { Criteria c = getSession().createCriteria(getPersistentClass()); c.add(Restrictions.eq("nome", conta.getNome())); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); c.add(Restrictions.eq("tipo", conta.getTipo())); if (conta.getContaId() != null) { diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/ContratoHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/ContratoHibernateDAO.java index c245fee72..c260e56a7 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/ContratoHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/ContratoHibernateDAO.java @@ -5,6 +5,7 @@ import java.util.List; import org.hibernate.Criteria; import org.hibernate.SessionFactory; +import org.hibernate.criterion.MatchMode; import org.hibernate.criterion.Restrictions; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; @@ -28,7 +29,7 @@ public class ContratoHibernateDAO extends GenericHibernateDAO obtenerTodos() { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); return c.list(); } diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/ConvenioHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/ConvenioHibernateDAO.java index 7a31c99f7..97aedea18 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/ConvenioHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/ConvenioHibernateDAO.java @@ -31,7 +31,7 @@ public class ConvenioHibernateDAO extends GenericHibernateDAO @Override public List obtenerTodos() { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); c.addOrder(Order.asc("descconvenio")); return c.list(); @@ -39,7 +39,7 @@ public class ConvenioHibernateDAO extends GenericHibernateDAO public List buscar(String descconvenio, String cveconvenio) { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); c.add(Restrictions.or(Restrictions.eq("descconvenio", descconvenio), Restrictions.eq("cveconvenio", cveconvenio))); c.addOrder(Order.asc("descconvenio")); diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/CorridaCtrlHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/CorridaCtrlHibernateDAO.java index d8997da84..53c21db1b 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/CorridaCtrlHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/CorridaCtrlHibernateDAO.java @@ -36,7 +36,7 @@ public class CorridaCtrlHibernateDAO extends GenericHibernateDAO buscarPorFecCorrida(final Date value) { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", ActivoUtil.ATIVO)); + c.add(Restrictions.eq(ACTIVO, ActivoUtil.ATIVO)); c.add(Restrictions.eq("id.feccorrida", value)); @@ -158,7 +158,7 @@ public class CorridaHibernateDAO extends GenericHibernateDAO buscarPorId(final Integer idCorrida) { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", ActivoUtil.ATIVO)); + c.add(Restrictions.eq(ACTIVO, ActivoUtil.ATIVO)); c.add(Restrictions.eq("id.corridaId", idCorrida)); return c.list(); @@ -208,7 +208,7 @@ public class CorridaHibernateDAO extends GenericHibernateDAO buscarFiltro(final Parada ori, final Parada des, final Date hora, final ClaseServicio cs) { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", ActivoUtil.ATIVO)); + c.add(Restrictions.eq(ACTIVO, ActivoUtil.ATIVO)); c.add(Restrictions.eq("origem", ori)); c.add(Restrictions.eq("destino", des)); c.add(Restrictions.between("fechorsalida", getDiaGeracaoHoraIni(hora), getDiaGeracaoHoraFim(hora))); @@ -223,7 +223,7 @@ public class CorridaHibernateDAO extends GenericHibernateDAO buscarTarjetaMesmaCorrida(CorridaTramo ct) { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", ActivoUtil.ATIVO)); + c.add(Restrictions.eq(ACTIVO, ActivoUtil.ATIVO)); c.add(Restrictions.eq("corrida", ct.getCorrida())); return c.list(); @@ -102,7 +102,7 @@ public class CorridaTramoHibernateDAO extends GenericHibernateDAO buscarTramoPorCorridaId(Integer corridaId) { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", ActivoUtil.ATIVO)); + c.add(Restrictions.eq(ACTIVO, ActivoUtil.ATIVO)); c.createAlias("corrida", "corrida"); c.add(Restrictions.eq("corrida.id.corridaId", corridaId)); c.setProjection(Projections.distinct(Projections.property("tramo"))); @@ -139,7 +139,7 @@ public class CorridaTramoHibernateDAO extends GenericHibernateDAO buscaCorridaTramoByFecCorridaECorridaId(Date fecCorrida, Integer corridaId, boolean isAutorizaServicoIniciado) { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", ActivoUtil.ATIVO)); + c.add(Restrictions.eq(ACTIVO, ActivoUtil.ATIVO)); c.createAlias("corrida", "corrida"); c.add(Restrictions.eq("corrida.id.corridaId", corridaId)); c.add(Restrictions.eq("corrida.id.feccorrida", fecCorrida)); diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/CortesiaBeneficiarioHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/CortesiaBeneficiarioHibernateDAO.java index 75245e218..e7547c78e 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/CortesiaBeneficiarioHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/CortesiaBeneficiarioHibernateDAO.java @@ -31,7 +31,7 @@ public class CortesiaBeneficiarioHibernateDAO extends GenericHibernateDAO obtenerTodos() { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); return c.list(); } diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/CortesiaDireccionHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/CortesiaDireccionHibernateDAO.java index a2f28fe3d..1e14b509b 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/CortesiaDireccionHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/CortesiaDireccionHibernateDAO.java @@ -36,7 +36,7 @@ public class CortesiaDireccionHibernateDAO extends GenericHibernateDAO obtenerTodos() { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); return c.list(); } @@ -44,7 +44,7 @@ public class CortesiaDireccionHibernateDAO extends GenericHibernateDAO pesquisar(Marca marca, ClaseServicio claseServicio, Date fecInicio, Date fecFinal) { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); if (marca != null) { c.add(Restrictions.eq("marca", marca)); @@ -67,7 +67,7 @@ public class CortesiaDireccionHibernateDAO extends GenericHibernateDAO buscar(CortesiaDireccion cortesiaDireccion) { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); // if (cortesiaDireccion.getFecInicioV() != null) { // c.add(Restrictions.eq("fecInicioV", cortesiaDireccion.getFecInicioV())); diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/CortesiaHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/CortesiaHibernateDAO.java index e36705460..a2d50b532 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/CortesiaHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/CortesiaHibernateDAO.java @@ -33,7 +33,7 @@ public class CortesiaHibernateDAO extends GenericHibernateDAO @Override public List obtenerTodos() { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); return c.list(); } @@ -41,7 +41,7 @@ public class CortesiaHibernateDAO extends GenericHibernateDAO public List pesquisar(Empleado empleado) { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); if (empleado != null) { @@ -53,7 +53,7 @@ public class CortesiaHibernateDAO extends GenericHibernateDAO public Cortesia buscar(Cortesia cortesia) { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); if (cortesia != null) { @@ -64,7 +64,7 @@ public class CortesiaHibernateDAO extends GenericHibernateDAO public List buscarDplicidad(Cortesia cortesia) { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); c.add(Restrictions.eq("empleado", cortesia.getEmpleado())); c.add(Restrictions.eq("marca", cortesia.getMarca())); diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/CotacaoHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/CotacaoHibernateDAO.java index d2c1abd33..f00812891 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/CotacaoHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/CotacaoHibernateDAO.java @@ -26,14 +26,14 @@ public class CotacaoHibernateDAO extends GenericHibernateDAO @Override public List obtenerTodos() { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); return c.list(); } public List buscar(String descmoneda) { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); return c.list(); } diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/CuponConvenioHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/CuponConvenioHibernateDAO.java index 30dd0ad29..93d7e416c 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/CuponConvenioHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/CuponConvenioHibernateDAO.java @@ -33,14 +33,14 @@ public class CuponConvenioHibernateDAO extends GenericHibernateDAO obtenerTodos() { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); return c.list(); } public List pesquisar(TipoConvenio tipoConvenio) { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); if (tipoConvenio != null) { c.add(Restrictions.eq("tipoConvenio", tipoConvenio)); diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/CuponSecretariaHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/CuponSecretariaHibernateDAO.java index b3ed0965a..13b07ba21 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/CuponSecretariaHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/CuponSecretariaHibernateDAO.java @@ -30,7 +30,7 @@ public class CuponSecretariaHibernateDAO extends GenericHibernateDAO obtenerTodos() { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); return c.list(); } diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/CursoHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/CursoHibernateDAO.java index ba7b3b1b5..0eb44a34f 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/CursoHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/CursoHibernateDAO.java @@ -25,7 +25,7 @@ public class CursoHibernateDAO extends GenericHibernateDAO @Override public List obtenerTodos() { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); c.addOrder(Order.asc("nomcurso")); return c.list(); @@ -33,7 +33,7 @@ public class CursoHibernateDAO extends GenericHibernateDAO public List buscar(String nomcurso){ Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); c.add(Restrictions.eq("nomcurso", nomcurso)); c.addOrder(Order.asc("nomcurso")); diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/CustomHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/CustomHibernateDAO.java index a1349e276..e89958d76 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/CustomHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/CustomHibernateDAO.java @@ -28,14 +28,14 @@ public class CustomHibernateDAO extends GenericHibernateDAO @Override public List obtenerTodos() { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); return c.list(); } public Custom buscar(String chave) { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); c.add(Restrictions.ilike("chave", chave)); @@ -44,7 +44,7 @@ public class CustomHibernateDAO extends GenericHibernateDAO public Custom buscar(Integer sistema, String chave) { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); c.add(Restrictions.eq("sistema", sistema)); c.add(Restrictions.ilike("chave", chave)); return c.list().isEmpty() ? null : (Custom) c.list().get(0); diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/DepositoBancarioHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/DepositoBancarioHibernateDAO.java index 7143a1043..0a1b18dcf 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/DepositoBancarioHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/DepositoBancarioHibernateDAO.java @@ -30,7 +30,7 @@ public class DepositoBancarioHibernateDAO extends GenericHibernateDAO obtenerTodos() { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); return c.list(); } diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/DescontoContratoHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/DescontoContratoHibernateDAO.java index d6f3238ad..a247c678b 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/DescontoContratoHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/DescontoContratoHibernateDAO.java @@ -24,7 +24,7 @@ public class DescontoContratoHibernateDAO extends GenericHibernateDAO obtenerTodos() { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); return c.list(); } diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/DetDiagramaAutobusHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/DetDiagramaAutobusHibernateDAO.java index a83ff0e1a..d9fd46ed5 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/DetDiagramaAutobusHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/DetDiagramaAutobusHibernateDAO.java @@ -31,7 +31,7 @@ public class DetDiagramaAutobusHibernateDAO extends GenericHibernateDAO obtenerTodos() { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); return c.list(); } @@ -39,7 +39,7 @@ public class DetDiagramaAutobusHibernateDAO extends GenericHibernateDAO obtenerTodos() { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); c.addOrder(Order.asc("descDiagrama")); return c.list(); @@ -48,7 +48,7 @@ public class DiagramaAutobusHibernateDAO extends GenericHibernateDAO buscar(String descDiagrama, Short maxparados, Short cantasientos) { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); c.add(Restrictions.eq("cantasientos", cantasientos)); c.add(Restrictions.eq("maxparados", maxparados)); @@ -59,7 +59,7 @@ public class DiagramaAutobusHibernateDAO extends GenericHibernateDAO buscar(String descDiagrama) { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); c.add(Restrictions.eq("descDiagrama", descDiagrama)); diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/DispositivoEmbarcadaHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/DispositivoEmbarcadaHibernateDAO.java index f4104f902..f80f77da9 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/DispositivoEmbarcadaHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/DispositivoEmbarcadaHibernateDAO.java @@ -36,7 +36,7 @@ public class DispositivoEmbarcadaHibernateDAO extends GenericHibernateDAO obtenerTodos() { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); c.addOrder(Order.asc("descricao")); return c.list(); @@ -45,7 +45,7 @@ public class DispositivoEmbarcadaHibernateDAO extends GenericHibernateDAO) c.list(); @@ -134,7 +134,7 @@ public class DispositivoEmbarcadaHibernateDAO extends GenericHibernateDAO obtenerTodos() { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); c.addOrder(Order.asc("descricao")); return c.list(); @@ -63,7 +63,7 @@ public class DispositivoEmbarcadaHistoricoHibernateDAO extends GenericHibernateD @Override public List buscarHistoricoDispositivoPorId(Long dispositivoId) { // Criteria c = getSession().createCriteria(getPersistentClass()); - // c.add(Restrictions.eq("activo", Boolean.TRUE)); + // c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); // c.add(Restrictions.eq("dispositivoEmbarcada.dispositivoEmbarcadaId", dispositivoId)); // c.addOrder(Order.desc("dispositivoEmbarcadaHistId")); // diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/DivisionHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/DivisionHibernateDAO.java index 8d9ef3167..8180befb3 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/DivisionHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/DivisionHibernateDAO.java @@ -25,7 +25,7 @@ implements DivisionDAO { @Override public List obtenerTodos() { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); return c.list(); } diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/EmbarqueCatracaRodoviariaHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/EmbarqueCatracaRodoviariaHibernateDAO.java index cdee3b058..04185db47 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/EmbarqueCatracaRodoviariaHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/EmbarqueCatracaRodoviariaHibernateDAO.java @@ -24,7 +24,7 @@ public class EmbarqueCatracaRodoviariaHibernateDAO @Override public List obtenerTodos() { Criteria criteria = getSession().createCriteria(getPersistentClass()); - criteria.add(Restrictions.eq("activo", true)); + criteria.add(Restrictions.eq(ACTIVO, true)); return criteria.list(); } } diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/EmpleadoHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/EmpleadoHibernateDAO.java index 4777e6d53..a1763f76e 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/EmpleadoHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/EmpleadoHibernateDAO.java @@ -32,14 +32,14 @@ public class EmpleadoHibernateDAO extends GenericHibernateDAO @Override public List obtenerTodos() { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); c.addOrder(Order.asc("nombEmpleado")); return c.list(); } public List pesquisaClave(String empleadoClave) { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); c.add(Restrictions.eq("cveEmpleado", empleadoClave)); return c.list(); @@ -49,7 +49,7 @@ public class EmpleadoHibernateDAO extends GenericHibernateDAO public List pesquisaEmpresa(Integer empresaId) { Criteria c = getSession().createCriteria(getPersistentClass()); c.add(Restrictions.eq("empresa.empresaId", empresaId)); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); c.addOrder(Order.asc("nombEmpleado")); return c.list(); } diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/EmpresaAdyenConfigHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/EmpresaAdyenConfigHibernateDAO.java index 06c0251e8..cfe2c68eb 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/EmpresaAdyenConfigHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/EmpresaAdyenConfigHibernateDAO.java @@ -25,7 +25,7 @@ public class EmpresaAdyenConfigHibernateDAO extends GenericHibernateDAO obtenerTodos() { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); return c.list(); } @@ -33,7 +33,7 @@ public class EmpresaAdyenConfigHibernateDAO extends GenericHibernateDAO obtenerTodos() { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); return c.list(); } public EmpresaAsistenciaDeViajeConfig buscarChave(String chave, Integer empresaId) { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); c.add(Restrictions.eq("chave", chave)); c.add(Restrictions.eq("empresa.empresaId", empresaId)); @@ -42,7 +42,7 @@ public class EmpresaAsistenciaDeViajeConfigHibernateDAO extends public List buscarByEmpresa(Integer empresaId) { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); c.add(Restrictions.eq("empresa.empresaId", empresaId)); return c.list(); diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/EmpresaCertificadoConfigHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/EmpresaCertificadoConfigHibernateDAO.java index 2c5aff4e4..b958ae4d6 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/EmpresaCertificadoConfigHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/EmpresaCertificadoConfigHibernateDAO.java @@ -26,7 +26,7 @@ public class EmpresaCertificadoConfigHibernateDAO extends GenericHibernateDAO obtenerTodos() { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); return c.list(); } @@ -34,7 +34,7 @@ public class EmpresaCertificadoConfigHibernateDAO extends GenericHibernateDAO obtenerTodos() { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); return c.list(); } @@ -35,7 +35,7 @@ public class EmpresaCieloLinkHibernateDAO extends GenericHibernateDAO buscarPorEmpresa(Empresa empresa) { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); c.add(Restrictions.eq("empresa.empresaId", empresa.getEmpresaId())); return Optional.ofNullable((EmpresaCieloLinkConfig) c.uniqueResult()); diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/EmpresaComprovantePassagemConfigHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/EmpresaComprovantePassagemConfigHibernateDAO.java index ec4184a5a..cbb4cf678 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/EmpresaComprovantePassagemConfigHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/EmpresaComprovantePassagemConfigHibernateDAO.java @@ -25,14 +25,14 @@ public class EmpresaComprovantePassagemConfigHibernateDAO extends @Override public List obtenerTodos() { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); return c.list(); } public EmpresaComprovantePassagemConfig buscarChave(String chave, Integer empresaId) { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); c.add(Restrictions.eq("chave", chave)); c.add(Restrictions.eq("empresa.empresaId", empresaId)); @@ -42,7 +42,7 @@ public class EmpresaComprovantePassagemConfigHibernateDAO extends public List buscarByEmpresa(Integer empresaId) { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); c.add(Restrictions.eq("empresa.empresaId", empresaId)); return c.list(); diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/EmpresaCrediBancoConfigHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/EmpresaCrediBancoConfigHibernateDAO.java index 2090de331..965a496fc 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/EmpresaCrediBancoConfigHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/EmpresaCrediBancoConfigHibernateDAO.java @@ -25,14 +25,14 @@ public class EmpresaCrediBancoConfigHibernateDAO extends GenericHibernateDAO obtenerTodos() { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); return c.list(); } public EmpresaCrediBancoConfig buscarChave(String chave, Integer empresaId) { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); c.add(Restrictions.eq("chave", chave)); c.add(Restrictions.eq("empresa.empresaId", empresaId)); @@ -42,7 +42,7 @@ public class EmpresaCrediBancoConfigHibernateDAO extends GenericHibernateDAO buscarByEmpresa(Integer empresaId) { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); c.add(Restrictions.eq("empresa.empresaId", empresaId)); return c.list(); diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/EmpresaEmailConfigHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/EmpresaEmailConfigHibernateDAO.java index f16feb30d..4cb98bc7c 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/EmpresaEmailConfigHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/EmpresaEmailConfigHibernateDAO.java @@ -25,7 +25,7 @@ public class EmpresaEmailConfigHibernateDAO extends GenericHibernateDAO obtenerTodos() { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); return c.list(); } @@ -33,7 +33,7 @@ public class EmpresaEmailConfigHibernateDAO extends GenericHibernateDAO obtenerTodos() { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); return c.list(); } @@ -33,7 +33,7 @@ public class EmpresaEmailEComerceHibernateDAO extends GenericHibernateDAO obtenerTodos() { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); return c.list(); } @@ -34,7 +34,7 @@ public class EmpresaEmailFlexBusHibernateDAO extends GenericHibernateDAO obtenerTodos() { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); return c.list(); } @@ -33,7 +33,7 @@ public class EmpresaEmailHibernateDAO extends GenericHibernateDAO i @Override public List obtenerTodos() { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); c.add(Restrictions.ne("empresaId", -1)); c.addOrder(Order.asc("nombempresa")); @@ -84,7 +84,7 @@ public class EmpresaHibernateDAO extends GenericHibernateDAO i @SuppressWarnings("unchecked") public List buscar(String nombempresa, Boolean indExterna, Short indTipo) { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); c.add(Restrictions.eq("nombempresa", nombempresa)); c.add(Restrictions.eq("indExterna", indExterna)); c.add(Restrictions.eq("indTipo", indTipo)); @@ -120,14 +120,14 @@ public class EmpresaHibernateDAO extends GenericHibernateDAO i Criteria c = makeCriteria(); c.setProjection(Projections.rowCount()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); c.add(Restrictions.ne("empresaId", -1)); Long cantEmpresasBaseDados = HibernateFix.count(c.list()); c = makeCriteria(); c.setProjection(Projections.rowCount()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); c.add(Restrictions.ne("empresaId", -1)); c.add(Restrictions.isNull("licenca")); @@ -143,7 +143,7 @@ public class EmpresaHibernateDAO extends GenericHibernateDAO i @SuppressWarnings("unchecked") public List obtenerIndExternoFalse() { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); c.add(Restrictions.eq("indExterna", Boolean.FALSE)); c.add(Restrictions.ne("empresaId", -1)); @@ -155,7 +155,7 @@ public class EmpresaHibernateDAO extends GenericHibernateDAO i @SuppressWarnings("unchecked") public List obtenerIndTipo2() { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); c.add(Restrictions.eq("indTipo", new Short("2"))); // Nao Buscar Empresa todas @@ -195,7 +195,7 @@ public class EmpresaHibernateDAO extends GenericHibernateDAO i Criteria c = getSession().createCriteria(InscricaoEstadual.class); c.add(Restrictions.eq("empresa", empresa)); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); return c.list(); } @@ -217,7 +217,7 @@ public class EmpresaHibernateDAO extends GenericHibernateDAO i @Override public List buscaLike(String nombempresa) { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); c.add(Restrictions.like("nombempresa", nombempresa, MatchMode.START)); c.add(Restrictions.ne("empresaId", -1)); @@ -298,7 +298,7 @@ public class EmpresaHibernateDAO extends GenericHibernateDAO i @SuppressWarnings("unchecked") public List obtenerTodosIncluindoEmpresaTodas() { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); c.addOrder(Order.asc("nombempresa")); return c.list(); diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/EmpresaMercadoPagoConfigHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/EmpresaMercadoPagoConfigHibernateDAO.java index 8db517f81..54cdbc375 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/EmpresaMercadoPagoConfigHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/EmpresaMercadoPagoConfigHibernateDAO.java @@ -25,7 +25,7 @@ public class EmpresaMercadoPagoConfigHibernateDAO extends GenericHibernateDAO obtenerTodos() { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); return c.list(); } @@ -33,7 +33,7 @@ public class EmpresaMercadoPagoConfigHibernateDAO extends GenericHibernateDAO obtenerTodos() { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); return c.list(); } @@ -33,7 +33,7 @@ public class EmpresaPMArtespConfigHibernateDAO extends GenericHibernateDAO obtenerTodos() { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); return c.list(); } @@ -35,7 +35,7 @@ public class EmpresaRecargaHibernateDAO extends GenericHibernateDAO buscarPorEmpresa(Empresa empresa) { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); c.add(Restrictions.eq("empresa.empresaId", empresa.getEmpresaId())); return Optional.ofNullable((EmpresaRecargaConfig) c.uniqueResult()); diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/EmpresaSaferConfigHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/EmpresaSaferConfigHibernateDAO.java index fa4c7979d..8bef1f4b3 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/EmpresaSaferConfigHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/EmpresaSaferConfigHibernateDAO.java @@ -25,7 +25,7 @@ public class EmpresaSaferConfigHibernateDAO extends GenericHibernateDAO obtenerTodos() { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); return c.list(); } @@ -33,7 +33,7 @@ public class EmpresaSaferConfigHibernateDAO extends GenericHibernateDAO obtenerTodos() { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); return c.list(); } public EmpresaSicfeConfig buscarChave(String chave, Integer empresaId) { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); c.add(Restrictions.eq("chave", chave)); c.add(Restrictions.eq("empresa.empresaId", empresaId)); @@ -43,7 +43,7 @@ public class EmpresaSicfeConfigHibernateDAO extends GenericHibernateDAO buscarByEmpresa(Integer empresaId) { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); c.add(Restrictions.eq("empresa.empresaId", empresaId)); return c.list(); diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/EmpresaTrocoSimplesHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/EmpresaTrocoSimplesHibernateDAO.java index 42fff2c6b..b7daa17ac 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/EmpresaTrocoSimplesHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/EmpresaTrocoSimplesHibernateDAO.java @@ -21,7 +21,7 @@ public class EmpresaTrocoSimplesHibernateDAO extends GenericHibernateDAO obtenerTodos() { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); return c.list(); } public List buscar(Date datapacote, String numoperacion) { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); if(datapacote != null) { c.add(Restrictions.eq("hotel.datapacote", datapacote)); diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/EscolaHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/EscolaHibernateDAO.java index d3da54f64..40e0cdf2d 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/EscolaHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/EscolaHibernateDAO.java @@ -26,7 +26,7 @@ public class EscolaHibernateDAO extends GenericHibernateDAO @Override public List obtenerTodos() { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); c.addOrder(Order.asc("nombescola")); return c.list(); @@ -35,7 +35,7 @@ public class EscolaHibernateDAO extends GenericHibernateDAO @Override public List buscar(String nombescola, Ciudad ciudad) { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); c.add(Restrictions.eq("nombescola", nombescola)); c.add(Restrictions.eq("ciudad", ciudad)); c.addOrder(Order.asc("nombescola")); diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/EsquemaAgrupacionHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/EsquemaAgrupacionHibernateDAO.java index 5d99001b2..48a399fe4 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/EsquemaAgrupacionHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/EsquemaAgrupacionHibernateDAO.java @@ -48,14 +48,14 @@ public class EsquemaAgrupacionHibernateDAO extends GenericHibernateDAO obtenerTodos() { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); return c.list(); } public List buscar(EsquemaAgrupacion esquemaAgrupacion) { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); c.add(Restrictions.eq("esquemaAgrupacion", esquemaAgrupacion)); return c.list(); } @@ -65,7 +65,7 @@ public class EsquemaAgrupacionHibernateDAO extends GenericHibernateDAO obtenerPorCorrida(EsquemaCorrida esquemaCorrida) { Criteria c = getSession().createCriteria(getPersistentClass()); c.add(Restrictions.eq("esquemaCorrida", esquemaCorrida)); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); return c.list(); } @@ -39,7 +39,7 @@ public class EsquemaAsientoHibernateDAO extends GenericHibernateDAO obtenerPorEsquemaCorrida(EsquemaCorrida esquemaCorrida) { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); c.add(Restrictions.eq("esquemaCorrida", esquemaCorrida)); return c.list(); } diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/EsquemaCorridaHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/EsquemaCorridaHibernateDAO.java index 33466101e..70628d342 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/EsquemaCorridaHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/EsquemaCorridaHibernateDAO.java @@ -47,7 +47,7 @@ public class EsquemaCorridaHibernateDAO extends GenericHibernateDAO obtenerTodos() { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); return c.list(); } @@ -86,7 +86,7 @@ public class EsquemaCorridaHibernateDAO extends GenericHibernateDAO buscar(Marca marca, RolOperativo rolOperativo, Ruta ruta, ClaseServicio claseServicio) { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); c.add(Restrictions.eq("ruta", ruta)); c.add(Restrictions.eq("marca", marca)); @@ -123,7 +123,7 @@ public class EsquemaCorridaHibernateDAO extends GenericHibernateDAO buscarPorRuta(Ruta ruta) { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); c.add(Restrictions.eq("ruta", ruta)); @@ -134,7 +134,7 @@ public class EsquemaCorridaHibernateDAO extends GenericHibernateDAO primeiroPiso = c.list(); @@ -174,7 +174,7 @@ public class EsquemaCorridaHibernateDAO extends GenericHibernateDAO primeiroPiso = c.list(); @@ -232,7 +232,7 @@ public class EsquemaCorridaHibernateDAO extends GenericHibernateDAO primeiroPiso = c.list(); @@ -247,12 +247,12 @@ public class EsquemaCorridaHibernateDAO extends GenericHibernateDAO buscaDentroVigencia(Date dataGeracao) { Criteria c = makeCriteria(); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); Criteria cEsquemaOperacional = c.createCriteria("esquemaOperacional"); cEsquemaOperacional.add(Restrictions.le("fecniciovigencia", dataGeracao)); cEsquemaOperacional.add(Restrictions.ge("fecfinvigencia", dataGeracao)); - cEsquemaOperacional.add(Restrictions.eq("activo", Boolean.TRUE)); + cEsquemaOperacional.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); return c.list(); } @@ -260,13 +260,13 @@ public class EsquemaCorridaHibernateDAO extends GenericHibernateDAO buscaDentroVigenciaQtdeDiasNull(Date dataGeracao) { Criteria c = makeCriteria(); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); c.add(Restrictions.isNull("cantDiasGeneracion")); Criteria cEsquemaOperacional = c.createCriteria("esquemaOperacional"); cEsquemaOperacional.add(Restrictions.le("fecniciovigencia", dataGeracao)); cEsquemaOperacional.add(Restrictions.ge("fecfinvigencia", dataGeracao)); - cEsquemaOperacional.add(Restrictions.eq("activo", Boolean.TRUE)); + cEsquemaOperacional.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); return c.list(); } @@ -274,7 +274,7 @@ public class EsquemaCorridaHibernateDAO extends GenericHibernateDAO lsEsquemaCorrida; Criteria c = makeCriteria(); c.add(Restrictions.eq("ruta", ruta)); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); c.setFirstResult(0); c.setMaxResults(1); c.createCriteria("esquemaOperacional").add(Restrictions.ge("fecfinvigencia", new Date())); @@ -328,7 +328,7 @@ public class EsquemaCorridaHibernateDAO extends GenericHibernateDAO lsEsquemaCorrida; Criteria c = makeCriteria(); c.add(Restrictions.eq("ruta.rutaId", rutaId)); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); c.add(Restrictions.eq("numCorrida", numCorrida)); c.setFirstResult(0); c.setMaxResults(1); @@ -340,7 +340,7 @@ public class EsquemaCorridaHibernateDAO extends GenericHibernateDAO buscaDentroVigenciaQtdeDiasNotNull(Date dataGeracao) { Criteria c = makeCriteria(); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); c.add(Restrictions.isNotNull("cantDiasGeneracion")); Criteria cEsquemaOperacional = c.createCriteria("esquemaOperacional"); cEsquemaOperacional.add(Restrictions.ge("fecfinvigencia", dataGeracao)); - cEsquemaOperacional.add(Restrictions.eq("activo", Boolean.TRUE)); + cEsquemaOperacional.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); return c.list(); } diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/EsquemaCorridaInfoHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/EsquemaCorridaInfoHibernateDAO.java index 465d4eeb7..a92a8a30d 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/EsquemaCorridaInfoHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/EsquemaCorridaInfoHibernateDAO.java @@ -25,7 +25,7 @@ public class EsquemaCorridaInfoHibernateDAO extends GenericHibernateDAO obtenerPorEsquemaCorrida(EsquemaCorrida esquemaCorrida) { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); c.add(Restrictions.eq("esquemaCorrida", esquemaCorrida)); return c.list(); } diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/EsquemaOperacionalHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/EsquemaOperacionalHibernateDAO.java index ab3332515..03ce177c5 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/EsquemaOperacionalHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/EsquemaOperacionalHibernateDAO.java @@ -33,7 +33,7 @@ public class EsquemaOperacionalHibernateDAO extends GenericHibernateDAO obtenerPorEsquemaCorrida(EsquemaCorrida ec) { Criteria c = getSession().createCriteria(getPersistentClass()); c.add(Restrictions.eq("esquemaCorrida", ec)); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); return c.list(); } @@ -40,7 +40,7 @@ public class EsquemaTramoHibernateDAO extends GenericHibernateDAO obtenerPorEsquemaCorridaOrderNumSec(EsquemaCorrida ec) { Criteria c = getSession().createCriteria(getPersistentClass()); c.add(Restrictions.eq("esquemaCorrida", ec)); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); c.addOrder(Order.asc("numsecuencia")); return c.list(); @@ -49,7 +49,7 @@ public class EsquemaTramoHibernateDAO extends GenericHibernateDAO obtenerAtivosDesativosPorEsquemaCorrida(EsquemaCorrida esquemaCorrida) { Criteria c = getSession().createCriteria(getPersistentClass()); c.add(Restrictions.eq("esquemaCorrida", esquemaCorrida)); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); c.addOrder(Order.asc("numsecuencia")); return c.list(); @@ -58,7 +58,7 @@ public class EsquemaTramoHibernateDAO extends GenericHibernateDAO @Override public List obtenerTodos() { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); c.addOrder(Order.asc("descestacion")); return c.list(); @@ -49,7 +49,7 @@ public class EstacionHibernateDAO extends GenericHibernateDAO public List buscar(String descEstacion, String descMac, Long nunCaja, PuntoVenta pv) { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); if(StringUtils.isNotBlank(descEstacion)) { c.add(Restrictions.like("descestacion", descEstacion, MatchMode.START)); @@ -71,7 +71,7 @@ public class EstacionHibernateDAO extends GenericHibernateDAO public List buscar(String descMac) { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); c.add(Restrictions.eq("descmac", descMac)); return c.list(); @@ -79,7 +79,7 @@ public class EstacionHibernateDAO extends GenericHibernateDAO public Estacion buscarPorIMEI(String imei) { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); c.add(Restrictions.eq("imei", imei)); return (Estacion) c.uniqueResult(); @@ -88,7 +88,7 @@ public class EstacionHibernateDAO extends GenericHibernateDAO @Override public List buscar(Long numCaja, PuntoVenta puntoVenta) { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); c.add(Restrictions.eq("numcaja", numCaja)); c.add(Restrictions.eq("puntoVenta", puntoVenta)); c.setResultTransformer(Criteria.DISTINCT_ROOT_ENTITY); @@ -99,7 +99,7 @@ public class EstacionHibernateDAO extends GenericHibernateDAO public List buscarEstaciones(PuntoVenta puntoVenta) { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); c.add(Restrictions.eq("puntoVenta", puntoVenta)); c.addOrder(Order.asc("numcaja")); c.addOrder(Order.asc("descestacion")); @@ -112,7 +112,7 @@ public class EstacionHibernateDAO extends GenericHibernateDAO public List buscarPuntosVentaEstacionPorUsuario(Usuario usuario) { Criteria buscaPuntoVentasUsuario = getSession().createCriteria(getPersistentClass()) .setProjection(Projections.distinct(Property.forName("puntoVenta"))) - .add(Restrictions.eq("activo", Boolean.TRUE)) + .add(Restrictions.eq(ACTIVO, Boolean.TRUE)) .add(Restrictions.eq("usuarioId", usuario.getUsuarioId())); return buscaPuntoVentasUsuario.list(); @@ -200,7 +200,7 @@ public class EstacionHibernateDAO extends GenericHibernateDAO public List buscarEstaciones(List lsPuntoVenta) { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); c.add(Restrictions.in("puntoVenta", lsPuntoVenta)); c.addOrder(Order.asc("numcaja")); c.addOrder(Order.asc("descestacion")); @@ -213,7 +213,7 @@ public class EstacionHibernateDAO extends GenericHibernateDAO public List buscarEstacionesStockCentral(PuntoVenta puntoVenta) { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); c.add(Restrictions.eq("indStockCentral", Boolean.TRUE)); c.add(Restrictions.eq("puntoVenta", puntoVenta)); c.addOrder(Order.asc("descestacion")); diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/EstacionSitefHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/EstacionSitefHibernateDAO.java index 9abdc81d3..6ec6510f3 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/EstacionSitefHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/EstacionSitefHibernateDAO.java @@ -39,7 +39,7 @@ public class EstacionSitefHibernateDAO extends GenericHibernateDAO estacionsSitef = c.list(); return estacionsSitef.isEmpty() ? null : estacionsSitef.get(0); } @@ -51,7 +51,7 @@ public class EstacionSitefHibernateDAO extends GenericHibernateDAO estacionsSitef = c.list(); diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/EstadoHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/EstadoHibernateDAO.java index f458ae9a9..b1124d1f9 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/EstadoHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/EstadoHibernateDAO.java @@ -48,7 +48,7 @@ public class EstadoHibernateDAO extends GenericHibernateDAO @Override public List obtenerTodos() { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); c.addOrder(Order.asc("nombestado")); return c.list(); @@ -56,7 +56,7 @@ public class EstadoHibernateDAO extends GenericHibernateDAO public List buscar(String nombestado, Pais pais) { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); c.add(Restrictions.eq("nombestado", nombestado)); c.add(Restrictions.eq("pais", pais)); @@ -86,7 +86,7 @@ public class EstadoHibernateDAO extends GenericHibernateDAO @Override public List buscarCveEstado(String cveEstado) { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); c.add(Restrictions.eq("cveestado", cveEstado)); return c.list(); } diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/EventoExtraHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/EventoExtraHibernateDAO.java index 77d27e5c4..f99823eb7 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/EventoExtraHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/EventoExtraHibernateDAO.java @@ -26,7 +26,7 @@ public class EventoExtraHibernateDAO extends @Override public List obtenerTodos() { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); return c.list(); } @@ -34,7 +34,7 @@ public class EventoExtraHibernateDAO extends public List obtenerPorTipo(TipoEventoExtra tipoEventoExtra) { Criteria c = getSession().createCriteria(getPersistentClass()); c.add(Restrictions.eq("tipoeventoextraId", tipoEventoExtra.getTipoeventoextraId())); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); return c.list(); } } diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/ExcecaoGrupoContratoHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/ExcecaoGrupoContratoHibernateDAO.java index 6637017fd..07ca4bc68 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/ExcecaoGrupoContratoHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/ExcecaoGrupoContratoHibernateDAO.java @@ -24,7 +24,7 @@ public class ExcecaoGrupoContratoHibernateDAO extends GenericHibernateDAO obtenerTodos() { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); return c.list(); } diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/ExcepcionPeajeHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/ExcepcionPeajeHibernateDAO.java index d1c54402e..ccb2db73a 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/ExcepcionPeajeHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/ExcepcionPeajeHibernateDAO.java @@ -29,7 +29,7 @@ implements ExcepcionPeajeDAO { public List buscar(String descconvenio, String cveconvenio) { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); c.add(Restrictions.eq("descconvenio", descconvenio)); c.add(Restrictions.eq("cveconvenio", cveconvenio)); @@ -42,7 +42,7 @@ implements ExcepcionPeajeDAO { Session session = getSession(); session.enableFilter("ativo"); Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); List list = (List)c.list(); for (ExcepcionPeaje excepcionPeaje : list) { diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/ExcepcionRedondoHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/ExcepcionRedondoHibernateDAO.java index fd178be63..8f4057b5f 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/ExcepcionRedondoHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/ExcepcionRedondoHibernateDAO.java @@ -31,7 +31,7 @@ public class ExcepcionRedondoHibernateDAO extends GenericHibernateDAO obtenerTodos() { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); c.addOrder(Order.asc("indtipo")); return c.list(); @@ -39,7 +39,7 @@ public class ExcepcionRedondoHibernateDAO extends GenericHibernateDAO buscar(String indTipo, Parada origem, Parada destino) { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); c.add(Restrictions.eq("origem", origem)); c.add(Restrictions.eq("destino", destino)); c.add(Restrictions.eq("indtipo", indTipo)); @@ -52,7 +52,7 @@ public class ExcepcionRedondoHibernateDAO extends GenericHibernateDAO buscar(Parada origem, Parada destino) { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); c.add(Restrictions.eq("origem", origem)); c.add(Restrictions.eq("destino", destino)); diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/FechamentoParamgeralHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/FechamentoParamgeralHibernateDAO.java index 8a7af369b..c1c234501 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/FechamentoParamgeralHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/FechamentoParamgeralHibernateDAO.java @@ -29,7 +29,7 @@ public class FechamentoParamgeralHibernateDAO extends GenericHibernateDAO)query.list(); } @@ -37,7 +37,7 @@ public class FechamentoParamgeralHibernateDAO extends GenericHibernateDAO obtenerTodos() { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); return (List)c.list(); } @@ -47,7 +47,7 @@ public class FechamentoParamgeralHibernateDAO extends GenericHibernateDAO)query.list(); } diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/FechamentoParamptovtaHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/FechamentoParamptovtaHibernateDAO.java index 879e4a319..9ac878212 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/FechamentoParamptovtaHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/FechamentoParamptovtaHibernateDAO.java @@ -31,7 +31,7 @@ public class FechamentoParamptovtaHibernateDAO extends GenericHibernateDAO)query.list(); } @@ -39,7 +39,7 @@ public class FechamentoParamptovtaHibernateDAO extends GenericHibernateDAO obtenerTodos() { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); return (List)c.list(); } @@ -49,7 +49,7 @@ public class FechamentoParamptovtaHibernateDAO extends GenericHibernateDAO)query.list(); } @@ -66,7 +66,7 @@ public class FechamentoParamptovtaHibernateDAO extends GenericHibernateDAO buscaParametrosPorPuntoventa(PuntoVenta puntoventa) { Criteria query = getSession().createCriteria(getPersistentClass()); query.add(Restrictions.eq("puntoventa", puntoventa)); - query.add(Restrictions.eq("activo", Boolean.TRUE)); + query.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); List params = query.list(); @@ -77,7 +77,7 @@ public class FechamentoParamptovtaHibernateDAO extends GenericHibernateDAO i @Override public List obtenerTodos() { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); c.addOrder(Order.asc("id")); return c.list(); @@ -75,7 +75,7 @@ public class FeriadoHibernateDAO extends GenericHibernateDAO i public List buscarDataEmpresaEstado(Date data, Empresa empresa, Estado estado) { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); c.add(Restrictions.eq("fecferiado", data)); c.add(Restrictions.eq("estado", estado)); diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/FiscalImpressoraEstadoHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/FiscalImpressoraEstadoHibernateDAO.java index c02432ee5..1d1d30f0f 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/FiscalImpressoraEstadoHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/FiscalImpressoraEstadoHibernateDAO.java @@ -25,7 +25,7 @@ public class FiscalImpressoraEstadoHibernateDAO extends GenericHibernateDAO obtenerTodos() { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); c.addOrder(Order.asc("estado.nombestado")); return c.list(); @@ -33,7 +33,7 @@ public class FiscalImpressoraEstadoHibernateDAO extends GenericHibernateDAO retornaEstadosFiscalImpressora(FiscalImpressora fiscalImpressora) { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); c.add(Restrictions.eq("fiscalImpressora", fiscalImpressora)); return c.list(); diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/FiscalImpressoraHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/FiscalImpressoraHibernateDAO.java index df0b8f24c..8b4bf363b 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/FiscalImpressoraHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/FiscalImpressoraHibernateDAO.java @@ -87,14 +87,14 @@ public class FiscalImpressoraHibernateDAO extends GenericHibernateDAO obtenerTodosTotnaofiscalEmpresa() { Criteria criteria = getSession().createCriteria(FiscalTotnaofiscalEmpresa.class); - criteria.add(Restrictions.eq("activo", true)); + criteria.add(Restrictions.eq(ACTIVO, true)); return criteria.list(); } @Override public FiscalTotnaofiscalEmpresa obtenerIDTotnaofiscalEmpresa(Long id) { Criteria criteria = getSession().createCriteria(FiscalTotnaofiscalEmpresa.class); - criteria.add(Restrictions.eq("activo", true)); + criteria.add(Restrictions.eq(ACTIVO, true)); criteria.add(Restrictions.eq("fiscalformapagoempresaId", id)); return (FiscalTotnaofiscalEmpresa) criteria.uniqueResult(); @@ -103,7 +103,7 @@ public class FiscalImpressoraHibernateDAO extends GenericHibernateDAO obtenerTodosFormapagoEmpresa() { Criteria criteria = getSession().createCriteria(FiscalFormapagoEmpresa.class); - criteria.add(Restrictions.eq("activo", true)); + criteria.add(Restrictions.eq(ACTIVO, true)); return criteria.list(); } @Override public FiscalFormapagoEmpresa obtenerIDFormapagoEmpresa(Long id) { Criteria criteria = getSession().createCriteria(FiscalFormapagoEmpresa.class); - criteria.add(Restrictions.eq("activo", true)); + criteria.add(Restrictions.eq(ACTIVO, true)); criteria.add(Restrictions.eq("fiscalformapagoempresaId", id)); return (FiscalFormapagoEmpresa) criteria.uniqueResult(); @@ -177,7 +177,7 @@ public class FiscalImpressoraHibernateDAO extends GenericHibernateDAO obtenerTodosRelgerencialEmpresa() { Criteria criteria = getSession().createCriteria(FiscalRelgerencialEmpresa.class); - criteria.add(Restrictions.eq("activo", true)); + criteria.add(Restrictions.eq(ACTIVO, true)); return criteria.list(); } @Override public FiscalRelgerencialEmpresa obtenerIDRelgerencialEmpresa(Long id) { Criteria criteria = getSession().createCriteria(FiscalTotnaofiscalEmpresa.class); - criteria.add(Restrictions.eq("activo", true)); + criteria.add(Restrictions.eq(ACTIVO, true)); criteria.add(Restrictions.eq("fiscalformapagoempresaId", id)); return (FiscalRelgerencialEmpresa) criteria.uniqueResult(); diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/FormaPagoDetHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/FormaPagoDetHibernateDAO.java index 3805d25a1..23a99e6df 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/FormaPagoDetHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/FormaPagoDetHibernateDAO.java @@ -30,7 +30,7 @@ public class FormaPagoDetHibernateDAO extends GenericHibernateDAO obtenerTodos() { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); return c.list(); } diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/FormaPagoHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/FormaPagoHibernateDAO.java index 6e69e0146..765c3d602 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/FormaPagoHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/FormaPagoHibernateDAO.java @@ -31,7 +31,7 @@ public class FormaPagoHibernateDAO extends GenericHibernateDAO @Override public List obtenerTodos() { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); c.addOrder(Order.asc("descpago")); return c.list(); @@ -39,7 +39,7 @@ public class FormaPagoHibernateDAO extends GenericHibernateDAO public List buscarPorDescricao(String descpago) { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); c.add(Restrictions.eq("descpago", descpago)); return c.list(); @@ -50,7 +50,7 @@ public class FormaPagoHibernateDAO extends GenericHibernateDAO for (Integer id : idFormaPago) { c.add(Restrictions.ne("formapagoId", id.shortValue())); } - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); c.addOrder(Order.asc("descpago")); return c.list(); diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/FuncionSistemaHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/FuncionSistemaHibernateDAO.java index c899169a1..5526099e9 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/FuncionSistemaHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/FuncionSistemaHibernateDAO.java @@ -31,7 +31,7 @@ public class FuncionSistemaHibernateDAO extends GenericHibernateDAO obtenerTodos() { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); c.add(Restrictions.not(Restrictions.eq("descruta", "COM.RJCONSULTORES.ADMINISTRACION.GUI.CONFIGURACIONECCOMERCIALES.MENU.CONFIGURACIONGENERAL"))); c.addOrder(Order.asc("nombfuncion")); diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/GP_PricingAsientoHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/GP_PricingAsientoHibernateDAO.java index 01ae86a59..908d0a718 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/GP_PricingAsientoHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/GP_PricingAsientoHibernateDAO.java @@ -26,14 +26,14 @@ public class GP_PricingAsientoHibernateDAO extends GenericHibernateDAO obtenerTodos() { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Pricing.ATIVO)); + c.add(Restrictions.eq(ACTIVO, Pricing.ATIVO)); return c.list(); } public List obtenerPricingCategoria(GP_Pricing pricing, Integer asiento) { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Pricing.ATIVO)); + c.add(Restrictions.eq(ACTIVO, Pricing.ATIVO)); c.add(Restrictions.eq("pricing", pricing)); c.add(Restrictions.eq("numeasiento", asiento.toString())); diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/GP_PricingCategoriaHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/GP_PricingCategoriaHibernateDAO.java index 779673d08..a6644b006 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/GP_PricingCategoriaHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/GP_PricingCategoriaHibernateDAO.java @@ -26,14 +26,14 @@ public class GP_PricingCategoriaHibernateDAO extends GenericHibernateDAO obtenerTodos() { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", GP_Pricing.ATIVO)); + c.add(Restrictions.eq(ACTIVO, GP_Pricing.ATIVO)); return c.list(); } public Boolean obtenerPricingCategoria(GP_Pricing pricing, Categoria categoria) { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", GP_Pricing.ATIVO)); + c.add(Restrictions.eq(ACTIVO, GP_Pricing.ATIVO)); c.add(Restrictions.eq("pricing", pricing)); c.add(Restrictions.eq("categoria", categoria)); diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/GP_PricingClaseHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/GP_PricingClaseHibernateDAO.java index 8a2819be3..6872e37fd 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/GP_PricingClaseHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/GP_PricingClaseHibernateDAO.java @@ -26,14 +26,14 @@ public class GP_PricingClaseHibernateDAO extends GenericHibernateDAO obtenerTodos() { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", GP_Pricing.ATIVO)); + c.add(Restrictions.eq(ACTIVO, GP_Pricing.ATIVO)); return c.list(); } public Boolean obtenerPricingClase(GP_Pricing pricing, ClaseServicio claseServicio) { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", GP_Pricing.ATIVO)); + c.add(Restrictions.eq(ACTIVO, GP_Pricing.ATIVO)); c.add(Restrictions.eq("pricing", pricing)); c.add(Restrictions.eq("claseServicio", claseServicio)); diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/GP_PricingClasseTarifariaHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/GP_PricingClasseTarifariaHibernateDAO.java index 07a40e165..8c1b027f9 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/GP_PricingClasseTarifariaHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/GP_PricingClasseTarifariaHibernateDAO.java @@ -26,7 +26,7 @@ public class GP_PricingClasseTarifariaHibernateDAO extends GenericHibernateDAO obtenerTodos() { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); return c.list(); } diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/GP_PricingCorridaHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/GP_PricingCorridaHibernateDAO.java index 451831888..0b56b5850 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/GP_PricingCorridaHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/GP_PricingCorridaHibernateDAO.java @@ -26,14 +26,14 @@ public class GP_PricingCorridaHibernateDAO extends GenericHibernateDAO obtenerTodos() { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", GP_Pricing.ATIVO)); + c.add(Restrictions.eq(ACTIVO, GP_Pricing.ATIVO)); return c.list(); } public Boolean obtenerPricingCorrida(GP_Pricing pricing, CorridaCtrl corrida) { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", GP_Pricing.ATIVO)); + c.add(Restrictions.eq(ACTIVO, GP_Pricing.ATIVO)); c.add(Restrictions.eq("pricing", pricing)); c.add(Restrictions.eq("corridaCtrl", corrida)); diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/GP_PricingDiaHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/GP_PricingDiaHibernateDAO.java index 7cba79217..2afbd3b41 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/GP_PricingDiaHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/GP_PricingDiaHibernateDAO.java @@ -33,7 +33,7 @@ public class GP_PricingDiaHibernateDAO extends GenericHibernateDAO obtenerTodos() { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Pricing.ATIVO)); + c.add(Restrictions.eq(ACTIVO, Pricing.ATIVO)); return c.list(); } diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/GP_PricingEspecificoAgenciaHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/GP_PricingEspecificoAgenciaHibernateDAO.java index 389219fe0..0d8cb77db 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/GP_PricingEspecificoAgenciaHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/GP_PricingEspecificoAgenciaHibernateDAO.java @@ -25,7 +25,7 @@ public class GP_PricingEspecificoAgenciaHibernateDAO extends GenericHibernateDAO @Override public List obtenerTodos() { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); return c.list(); } @@ -33,7 +33,7 @@ public class GP_PricingEspecificoAgenciaHibernateDAO extends GenericHibernateDAO @Override public Boolean isDuplicado(GP_PricingEspecificoAgencia entidad) { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); c.add(Restrictions.eq("puntoVenta.puntoventaId", entidad.getPuntoVenta().getPuntoventaId())); return c.list().isEmpty(); diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/GP_PricingEspecificoCanalVendasHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/GP_PricingEspecificoCanalVendasHibernateDAO.java index cfca88517..ac2ce0625 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/GP_PricingEspecificoCanalVendasHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/GP_PricingEspecificoCanalVendasHibernateDAO.java @@ -25,7 +25,7 @@ public class GP_PricingEspecificoCanalVendasHibernateDAO extends GenericHibernat @Override public List obtenerTodos() { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); return c.list(); } @@ -33,7 +33,7 @@ public class GP_PricingEspecificoCanalVendasHibernateDAO extends GenericHibernat @Override public Boolean isDuplicado(GP_PricingEspecificoCanalVendas entidad) { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); c.add(Restrictions.eq("tipoPtovta.tipoptovtaId", entidad.getTipoPtovta().getTipoptovtaId())); return c.list().isEmpty(); diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/GP_PricingEspecificoCategoriaHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/GP_PricingEspecificoCategoriaHibernateDAO.java index e0040302b..f9fddf3ba 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/GP_PricingEspecificoCategoriaHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/GP_PricingEspecificoCategoriaHibernateDAO.java @@ -24,7 +24,7 @@ public class GP_PricingEspecificoCategoriaHibernateDAO extends GenericHibernateD @Override public List obtenerTodos() { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); return c.list(); } @@ -32,7 +32,7 @@ public class GP_PricingEspecificoCategoriaHibernateDAO extends GenericHibernateD @Override public Boolean isDuplicado(GP_PricingEspecificoCategoria entidad) { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); c.add(Restrictions.eq("categoria.categoriaId", entidad.getCategoria().getCategoriaId())); return c.list().isEmpty(); diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/GP_PricingEspecificoHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/GP_PricingEspecificoHibernateDAO.java index 861d9f1e2..b126211f5 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/GP_PricingEspecificoHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/GP_PricingEspecificoHibernateDAO.java @@ -37,14 +37,14 @@ public class GP_PricingEspecificoHibernateDAO extends GenericHibernateDAO obtenerTodos() { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); return c.list(); } public List buscarPorNome(GP_PricingEspecifico pricingEspecifico) { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); c.add(Restrictions.eq("nombPricing", pricingEspecifico.getNombPricing())); return c.list(); @@ -53,7 +53,7 @@ public class GP_PricingEspecificoHibernateDAO extends GenericHibernateDAO buscarPorNome(String nome) { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); c.add(Restrictions.eq("nombPricing", nome)); return c.list(); diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/GP_PricingEspecificoOcupacionHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/GP_PricingEspecificoOcupacionHibernateDAO.java index f7775457f..33c7c8f5b 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/GP_PricingEspecificoOcupacionHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/GP_PricingEspecificoOcupacionHibernateDAO.java @@ -25,7 +25,7 @@ public class GP_PricingEspecificoOcupacionHibernateDAO extends GenericHibernateD @Override public List obtenerTodos() { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); return c.list(); } diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/GP_PricingGestaoHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/GP_PricingGestaoHibernateDAO.java index 82b122ee8..e86f08eb4 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/GP_PricingGestaoHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/GP_PricingGestaoHibernateDAO.java @@ -25,7 +25,7 @@ public class GP_PricingGestaoHibernateDAO extends GenericHibernateDAO obtenerTodos() { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", GP_Pricing.ATIVO)); + c.add(Restrictions.eq(ACTIVO, GP_Pricing.ATIVO)); return c.list(); } diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/GP_PricingHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/GP_PricingHibernateDAO.java index 6bdc013b6..580000b4d 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/GP_PricingHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/GP_PricingHibernateDAO.java @@ -32,7 +32,7 @@ public class GP_PricingHibernateDAO extends GenericHibernateDAO obtenerTodos() { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", GP_Pricing.ATIVO)); + c.add(Restrictions.eq(ACTIVO, GP_Pricing.ATIVO)); return c.list(); } @@ -42,7 +42,7 @@ public class GP_PricingHibernateDAO extends GenericHibernateDAO buscarPorNombre(String nombPricing) { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", GP_Pricing.ATIVO)); + c.add(Restrictions.eq(ACTIVO, GP_Pricing.ATIVO)); c.add(Restrictions.eq("nombPricing", nombPricing)); diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/GP_PricingImporteHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/GP_PricingImporteHibernateDAO.java index 4777fbcc1..202dd9db6 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/GP_PricingImporteHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/GP_PricingImporteHibernateDAO.java @@ -26,14 +26,14 @@ public class GP_PricingImporteHibernateDAO extends GenericHibernateDAO obtenerTodos() { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", GP_Pricing.ATIVO)); + c.add(Restrictions.eq(ACTIVO, GP_Pricing.ATIVO)); return c.list(); } public List buscarMoneda(GP_PricingImporte pricingImporte, Moneda moneda) { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", GP_Pricing.ATIVO)); + c.add(Restrictions.eq(ACTIVO, GP_Pricing.ATIVO)); c.add(Restrictions.eq("pricing", pricingImporte.getPricing())); c.add(Restrictions.eq("moneda", moneda)); diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/GP_PricingMarcaHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/GP_PricingMarcaHibernateDAO.java index 3dc6800ae..05d125726 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/GP_PricingMarcaHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/GP_PricingMarcaHibernateDAO.java @@ -26,14 +26,14 @@ public class GP_PricingMarcaHibernateDAO extends GenericHibernateDAO obtenerTodos() { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", GP_Pricing.ATIVO)); + c.add(Restrictions.eq(ACTIVO, GP_Pricing.ATIVO)); return c.list(); } public Boolean obtenerPricingMarca(GP_Pricing pricing, Marca marca) { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", GP_Pricing.ATIVO)); + c.add(Restrictions.eq(ACTIVO, GP_Pricing.ATIVO)); c.add(Restrictions.eq("pricing", pricing)); c.add(Restrictions.eq("marca", marca)); diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/GP_PricingMercadoHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/GP_PricingMercadoHibernateDAO.java index 4a78dd7c1..6624f8a2e 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/GP_PricingMercadoHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/GP_PricingMercadoHibernateDAO.java @@ -26,14 +26,14 @@ public class GP_PricingMercadoHibernateDAO extends GenericHibernateDAO obtenerTodos() { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", GP_Pricing.ATIVO)); + c.add(Restrictions.eq(ACTIVO, GP_Pricing.ATIVO)); return c.list(); } public Boolean obtenerPricingMercado(GP_Pricing pricing, Parada origen, Parada destino) { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", GP_Pricing.ATIVO)); + c.add(Restrictions.eq(ACTIVO, GP_Pricing.ATIVO)); c.add(Restrictions.eq("pricing", pricing)); c.add(Restrictions.eq("origen", origen)); c.add(Restrictions.eq("destino", destino)); diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/GP_PricingOcupaAntecipaHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/GP_PricingOcupaAntecipaHibernateDAO.java index 1f97bd63f..7161a4961 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/GP_PricingOcupaAntecipaHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/GP_PricingOcupaAntecipaHibernateDAO.java @@ -26,7 +26,7 @@ public class GP_PricingOcupaAntecipaHibernateDAO extends GenericHibernateDAO obtenerTodos() { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", GP_Pricing.ATIVO)); + c.add(Restrictions.eq(ACTIVO, GP_Pricing.ATIVO)); return c.list(); } diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/GP_PricingPuntoVentaHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/GP_PricingPuntoVentaHibernateDAO.java index 40a300bc0..0c0eaa4c7 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/GP_PricingPuntoVentaHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/GP_PricingPuntoVentaHibernateDAO.java @@ -26,14 +26,14 @@ public class GP_PricingPuntoVentaHibernateDAO extends GenericHibernateDAO obtenerTodos() { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", GP_Pricing.ATIVO)); + c.add(Restrictions.eq(ACTIVO, GP_Pricing.ATIVO)); return c.list(); } public Boolean obtenerPricingPuntoVenta(GP_Pricing pricing, PuntoVenta puntoVenta) { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", GP_Pricing.ATIVO)); + c.add(Restrictions.eq(ACTIVO, GP_Pricing.ATIVO)); c.add(Restrictions.eq("pricing", pricing)); c.add(Restrictions.eq("puntoVenta", puntoVenta)); diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/GP_PricingRutaHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/GP_PricingRutaHibernateDAO.java index 2af54c600..c08f11fe9 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/GP_PricingRutaHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/GP_PricingRutaHibernateDAO.java @@ -26,14 +26,14 @@ public class GP_PricingRutaHibernateDAO extends GenericHibernateDAO obtenerTodos() { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", GP_Pricing.ATIVO)); + c.add(Restrictions.eq(ACTIVO, GP_Pricing.ATIVO)); return c.list(); } public Boolean obtenerPricingRuta(GP_Pricing pricing, Ruta ruta) { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", GP_Pricing.ATIVO)); + c.add(Restrictions.eq(ACTIVO, GP_Pricing.ATIVO)); c.add(Restrictions.eq("pricing", pricing)); c.add(Restrictions.eq("ruta", ruta)); diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/GP_PricingTipoPtoVtaHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/GP_PricingTipoPtoVtaHibernateDAO.java index 03c1598b3..e5ecd922e 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/GP_PricingTipoPtoVtaHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/GP_PricingTipoPtoVtaHibernateDAO.java @@ -26,14 +26,14 @@ public class GP_PricingTipoPtoVtaHibernateDAO extends GenericHibernateDAO obtenerTodos() { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", GP_Pricing.ATIVO)); + c.add(Restrictions.eq(ACTIVO, GP_Pricing.ATIVO)); return c.list(); } public Boolean obtenerPricingTipoPuntoVenta(GP_Pricing pricing, TipoPuntoVenta tipoPuntoVenta) { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", GP_Pricing.ATIVO)); + c.add(Restrictions.eq(ACTIVO, GP_Pricing.ATIVO)); c.add(Restrictions.eq("pricing", pricing)); c.add(Restrictions.eq("tipoPtovta", tipoPuntoVenta)); diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/GP_PricingTipoServicioHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/GP_PricingTipoServicioHibernateDAO.java index 07a98ed14..804b458f4 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/GP_PricingTipoServicioHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/GP_PricingTipoServicioHibernateDAO.java @@ -26,14 +26,14 @@ public class GP_PricingTipoServicioHibernateDAO extends GenericHibernateDAO obtenerTodos() { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", GP_Pricing.ATIVO)); + c.add(Restrictions.eq(ACTIVO, GP_Pricing.ATIVO)); return c.list(); } public Boolean obtenerPricingTipoServicio(GP_Pricing pricing, TipoServicio tipoServicio) { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", GP_Pricing.ATIVO)); + c.add(Restrictions.eq(ACTIVO, GP_Pricing.ATIVO)); c.add(Restrictions.eq("pricing", pricing)); c.add(Restrictions.eq("tipoServicio", tipoServicio)); diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/GP_PricingVigenciaHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/GP_PricingVigenciaHibernateDAO.java index e6c7b5b7e..5852bb585 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/GP_PricingVigenciaHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/GP_PricingVigenciaHibernateDAO.java @@ -27,7 +27,7 @@ public class GP_PricingVigenciaHibernateDAO extends GenericHibernateDAO obtenerTodos() { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", GP_Pricing.ATIVO)); + c.add(Restrictions.eq(ACTIVO, GP_Pricing.ATIVO)); return c.list(); } @@ -36,7 +36,7 @@ public class GP_PricingVigenciaHibernateDAO extends GenericHibernateDAO buscarPorVigencias(GP_PricingVigencia pv) { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", GP_Pricing.ATIVO)); + c.add(Restrictions.eq(ACTIVO, GP_Pricing.ATIVO)); c.add(Restrictions.eq("pricing", pv.getPricing())); @@ -62,7 +62,7 @@ public class GP_PricingVigenciaHibernateDAO extends GenericHibernateDAO extends HibernateDa Criteria c = this.makeCriteria(); c.add(Restrictions.eq(campo, o)); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); c.setProjection(Projections.rowCount()); diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/GrupoCategoriaHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/GrupoCategoriaHibernateDAO.java index f03342b0f..c5c45779b 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/GrupoCategoriaHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/GrupoCategoriaHibernateDAO.java @@ -25,14 +25,14 @@ public class GrupoCategoriaHibernateDAO extends GenericHibernateDAO obtenerTodos() { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); return c.list(); } @Override public List buscar(String descricao) { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); c.add(Restrictions.eq("descGrupo", descricao)); return c.list(); diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/GrupoContratoHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/GrupoContratoHibernateDAO.java index 6b8353409..287524ad0 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/GrupoContratoHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/GrupoContratoHibernateDAO.java @@ -14,7 +14,7 @@ import com.rjconsultores.ventaboletos.entidad.GrupoContrato; @SuppressWarnings("unchecked") @Repository("grupoContratoDAO") -public class GrupoContratoHibernateDAO extends GenericHibernateDAO implements GrupoContratoDAO { +public class GrupoContratoHibernateDAO extends GenericHibernateDAO implements GrupoContratoDAO { @Autowired public GrupoContratoHibernateDAO(@Qualifier("sessionFactory") SessionFactory factory) { @@ -24,14 +24,14 @@ public class GrupoContratoHibernateDAO extends GenericHibernateDAO obtenerTodos() { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); return c.list(); } public List buscar(String descgrupo) { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); c.add(Restrictions.eq("nomeGrupoContrato", descgrupo)); return c.list(); diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/GrupoCortesiasHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/GrupoCortesiasHibernateDAO.java index 4ac5ecebe..59c4ff99c 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/GrupoCortesiasHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/GrupoCortesiasHibernateDAO.java @@ -31,14 +31,14 @@ public class GrupoCortesiasHibernateDAO extends GenericHibernateDAO obtenerTodos() { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); return c.list(); } public List buscar(String descgrupo) { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); c.add(Restrictions.eq("descgrupo", descgrupo)); return c.list(); diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/GrupoRutaHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/GrupoRutaHibernateDAO.java index e4fcc83b3..96e498f7e 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/GrupoRutaHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/GrupoRutaHibernateDAO.java @@ -32,13 +32,13 @@ public class GrupoRutaHibernateDAO extends GenericHibernateDAO obtenerTodos() { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); return c.list(); } public List buscarPorNome(String descgrupo) { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); c.add(Restrictions.eq("descgrupo", descgrupo)); return c.list(); diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/HistoricoFormaPagoPuntoVentaHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/HistoricoFormaPagoPuntoVentaHibernateDAO.java index 29201ff13..33cdcbb4b 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/HistoricoFormaPagoPuntoVentaHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/HistoricoFormaPagoPuntoVentaHibernateDAO.java @@ -32,7 +32,7 @@ public class HistoricoFormaPagoPuntoVentaHibernateDAO extends GenericHibernateDA @Override public List obtenerTodos() { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); return c.list(); } @@ -40,7 +40,7 @@ public class HistoricoFormaPagoPuntoVentaHibernateDAO extends GenericHibernateDA @Override public List obtenerTodosPorPuntoVenta(PuntoVenta puntoVenta) { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); c.add(Restrictions.eq("puntoVenta", puntoVenta)); return c.list(); diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/HotelHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/HotelHibernateDAO.java index 0b0b34a1d..53a323d70 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/HotelHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/HotelHibernateDAO.java @@ -23,14 +23,14 @@ public class HotelHibernateDAO extends GenericHibernateDAO imple @Override public List obtenerTodos() { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); return c.list(); } public List buscar(String deschotel) { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); c.add(Restrictions.eq("deschotel", deschotel)); diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/ImagemHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/ImagemHibernateDAO.java index dbade2dd6..bdd317fc6 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/ImagemHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/ImagemHibernateDAO.java @@ -29,7 +29,7 @@ public class ImagemHibernateDAO extends GenericHibernateDAO @Override public List obtenerTodos() { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); c.addOrder(Order.asc("imagemId")); return c.list(); @@ -37,7 +37,7 @@ public class ImagemHibernateDAO extends GenericHibernateDAO public Imagem buscarPorNomeImagem(String nomeImagem) { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); c.add(Restrictions.eq("nombImagem", nomeImagem)); @@ -46,7 +46,7 @@ public class ImagemHibernateDAO extends GenericHibernateDAO public List buscar(String nomeImagem) { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); c.add(Restrictions.eq("nombImagem", nomeImagem)); diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/ImpresionLayoutConfigHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/ImpresionLayoutConfigHibernateDAO.java index 5d3767a63..a13a06844 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/ImpresionLayoutConfigHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/ImpresionLayoutConfigHibernateDAO.java @@ -26,14 +26,14 @@ public class ImpresionLayoutConfigHibernateDAO extends GenericHibernateDAO obtenerTodos() { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); return c.list(); } public List buscar(String descricao) { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); c.add(Restrictions.eq("descricao", descricao)); @@ -42,7 +42,7 @@ public class ImpresionLayoutConfigHibernateDAO extends GenericHibernateDAO buscarLike(String descricao) { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); c.add(Restrictions.like("descricao", descricao, MatchMode.ANYWHERE)); diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/InstiFinanceiraHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/InstiFinanceiraHibernateDAO.java index 13f5233b3..0dc104ffa 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/InstiFinanceiraHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/InstiFinanceiraHibernateDAO.java @@ -28,14 +28,14 @@ public class InstiFinanceiraHibernateDAO extends GenericHibernateDAO obtenerTodos() { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); c.addOrder(Order.asc("nome")); return c.list(); } public List buscar(String nome) { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); c.add(Restrictions.eq("nome", nome)); return c.list(); } @@ -44,7 +44,7 @@ public class InstiFinanceiraHibernateDAO extends GenericHibernateDAO buscarContasBancariasPorIdEmpresa(Integer empresaId) { Criteria c = getSession().createCriteria(EmpresaContaBancaria.class); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); c.add(Restrictions.eq("empresa.empresaId", empresaId)); List empresasContaBancarias = (List) c.list(); diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/ItemAdicionalHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/ItemAdicionalHibernateDAO.java index 47ad84de6..3cbb9ccee 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/ItemAdicionalHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/ItemAdicionalHibernateDAO.java @@ -27,7 +27,7 @@ public class ItemAdicionalHibernateDAO extends GenericHibernateDAO obtenerTodos() { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); c.addOrder(Order.asc("descitemadicional")); return c.list(); diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/ItemDescontoHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/ItemDescontoHibernateDAO.java index bec469943..e095aacdf 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/ItemDescontoHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/ItemDescontoHibernateDAO.java @@ -47,7 +47,7 @@ public class ItemDescontoHibernateDAO extends GenericHibernateDAO obtenerTodos() { Criteria c = this.makeCriteria(); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); return c.list(); } diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/MarcaAutobusHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/MarcaAutobusHibernateDAO.java index 6ab67b944..20dbfe562 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/MarcaAutobusHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/MarcaAutobusHibernateDAO.java @@ -24,7 +24,7 @@ implements MarcaAutobusDAO { @Override public List obtenerTodos() { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); return c.list(); } diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/MarcaClaseServicioHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/MarcaClaseServicioHibernateDAO.java index 1fe9182b6..1dc77e6b7 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/MarcaClaseServicioHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/MarcaClaseServicioHibernateDAO.java @@ -37,7 +37,7 @@ public class MarcaClaseServicioHibernateDAO @Override public List obtenerTodos() { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); return c.list(); } diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/MarcaHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/MarcaHibernateDAO.java index 13cb7cbac..e5c7f810c 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/MarcaHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/MarcaHibernateDAO.java @@ -42,7 +42,7 @@ public class MarcaHibernateDAO extends GenericHibernateDAO @Override public List obtenerTodos() { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); c.addOrder(Order.asc("descmarca")); return c.list(); @@ -52,7 +52,7 @@ public class MarcaHibernateDAO extends GenericHibernateDAO @Override public List buscarPorNome(String nomeMarca) { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); c.add(Restrictions.eq("descmarca", nomeMarca)); return c.list(); @@ -94,7 +94,7 @@ public class MarcaHibernateDAO extends GenericHibernateDAO }); Criteria c = makeCriteria(); - c.add(Restrictions.eq("activo", true)); + c.add(Restrictions.eq(ACTIVO, true)); c.add(Restrictions.in("empresa", idsEmpresa)); c.setFetchMode("logotipomarca", FetchMode.DEFAULT); @@ -104,7 +104,7 @@ public class MarcaHibernateDAO extends GenericHibernateDAO @Override public Marca buscarMarcaPorEmpresa(Empresa empresa) { Criteria c = makeCriteria(); - c.add(Restrictions.eq("activo", true)); + c.add(Restrictions.eq(ACTIVO, true)); c.add(Restrictions.eq("empresa", empresa)); List marcas = c.list(); if (marcas != null && !marcas.isEmpty()) { diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/MensagemRecusaHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/MensagemRecusaHibernateDAO.java index 3f618a47e..63455adbb 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/MensagemRecusaHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/MensagemRecusaHibernateDAO.java @@ -28,7 +28,7 @@ public class MensagemRecusaHibernateDAO extends GenericHibernateDAO obtenerTodos() { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); return c.list(); } @@ -36,7 +36,7 @@ public class MensagemRecusaHibernateDAO extends GenericHibernateDAO buscarPorCategoriaPadraoAPI(Integer categoriaId) { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); c.add(Restrictions.eq("padraoAPI", Boolean.TRUE)); c.add(Restrictions.eq("categoria.categoriaId", categoriaId)); return c.list(); diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/MensajeEmpresaHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/MensajeEmpresaHibernateDAO.java index b10d5df41..4acb55730 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/MensajeEmpresaHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/MensajeEmpresaHibernateDAO.java @@ -29,7 +29,7 @@ public class MensajeEmpresaHibernateDAO extends GenericHibernateDAO obtenerTodos() { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); return c.list(); } @@ -37,7 +37,7 @@ public class MensajeEmpresaHibernateDAO extends GenericHibernateDAO obtenerPorMensaje(Mensaje mensaje) { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); c.add(Restrictions.eq("mensaje", mensaje)); return c.list(); } diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/MensajeHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/MensajeHibernateDAO.java index 5ae462937..9df47d772 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/MensajeHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/MensajeHibernateDAO.java @@ -28,7 +28,7 @@ public class MensajeHibernateDAO extends GenericHibernateDAO i @Override public List obtenerTodos() { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); return c.list(); } diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/MensajePuntoVentaHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/MensajePuntoVentaHibernateDAO.java index a4a1a39f8..d2f8ca428 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/MensajePuntoVentaHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/MensajePuntoVentaHibernateDAO.java @@ -29,7 +29,7 @@ public class MensajePuntoVentaHibernateDAO extends GenericHibernateDAO obtenerTodos() { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); return c.list(); } @@ -37,7 +37,7 @@ public class MensajePuntoVentaHibernateDAO extends GenericHibernateDAO obtenerPorMensaje(Mensaje mensaje) { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); c.add(Restrictions.eq("mensaje", mensaje)); return c.list(); } diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/MensajeUsuarioHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/MensajeUsuarioHibernateDAO.java index 9d679cef6..638a96dec 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/MensajeUsuarioHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/MensajeUsuarioHibernateDAO.java @@ -29,7 +29,7 @@ public class MensajeUsuarioHibernateDAO extends GenericHibernateDAO obtenerTodos() { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); return c.list(); } @@ -37,7 +37,7 @@ public class MensajeUsuarioHibernateDAO extends GenericHibernateDAO obtenerPorMensaje(Mensaje mensaje) { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); c.add(Restrictions.eq("mensaje", mensaje)); return c.list(); } diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/MercadoCompetidoHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/MercadoCompetidoHibernateDAO.java index 968e289e8..4534bf4c6 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/MercadoCompetidoHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/MercadoCompetidoHibernateDAO.java @@ -34,7 +34,7 @@ public class MercadoCompetidoHibernateDAO @Override public List obtenerTodos() { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); return c.list(); } @@ -42,7 +42,7 @@ public class MercadoCompetidoHibernateDAO public boolean existe(ClaseServicio claseServicio, Parada origem, Parada destino) { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); c.add(Restrictions.eq("claseServicio", claseServicio)); c.add(Restrictions.eq("origem", origem)); @@ -55,7 +55,7 @@ public class MercadoCompetidoHibernateDAO public List buscar(Parada origem, Parada destino) { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); c.add(Restrictions.eq("origem", origem)); c.add(Restrictions.eq("destino", destino)); diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/MonedaHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/MonedaHibernateDAO.java index 2371096cc..80a5b4b43 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/MonedaHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/MonedaHibernateDAO.java @@ -31,7 +31,7 @@ public class MonedaHibernateDAO extends GenericHibernateDAO @Override public List obtenerTodos() { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); c.addOrder(Order.asc("descmoneda")); return c.list(); @@ -39,7 +39,7 @@ public class MonedaHibernateDAO extends GenericHibernateDAO public List buscar(String descmoneda) { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); c.add(Restrictions.eq("descmoneda", descmoneda)); return c.list(); diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/MotivoCancelVendaPacotelHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/MotivoCancelVendaPacotelHibernateDAO.java index 3b0b2b23f..8215e83c9 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/MotivoCancelVendaPacotelHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/MotivoCancelVendaPacotelHibernateDAO.java @@ -33,7 +33,7 @@ public class MotivoCancelVendaPacotelHibernateDAO extends GenericHibernateDAO obtenerTodos() { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); c.addOrder(Order.asc("descmotivocancel")); return c.list(); @@ -41,7 +41,7 @@ public class MotivoCancelVendaPacotelHibernateDAO extends GenericHibernateDAO buscar(String descmotivocancel, String tipomotivocancel) { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); c.add(Restrictions.eq("descmotivocancel", descmotivocancel)); c.add(Restrictions.eq("tipomotivocancel", tipomotivocancel)); @@ -50,7 +50,7 @@ public class MotivoCancelVendaPacotelHibernateDAO extends GenericHibernateDAO obtenerTodosTipoMotivoCancel() { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); c.addOrder(Order.asc("descmotivocancel")); return c.list(); @@ -58,7 +58,7 @@ public class MotivoCancelVendaPacotelHibernateDAO extends GenericHibernateDAO obtenerTodosEspecificos(Integer[] motivos) { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); c.add(Restrictions.in("motivocancelacionId", motivos)); c.addOrder(Order.asc("descmotivocancel")); diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/MotivoCancelacionHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/MotivoCancelacionHibernateDAO.java index 8b7abcef0..bcc717b36 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/MotivoCancelacionHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/MotivoCancelacionHibernateDAO.java @@ -35,7 +35,7 @@ public class MotivoCancelacionHibernateDAO extends GenericHibernateDAO obtenerTodos() { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); c.addOrder(Order.asc("descmotivo")); return c.list(); @@ -43,7 +43,7 @@ public class MotivoCancelacionHibernateDAO extends GenericHibernateDAO buscar(String descmotivo, String tipomotivo) { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); c.add(Restrictions.eq("descmotivo", descmotivo)); c.add(Restrictions.eq("tipomotivo", tipomotivo)); @@ -52,7 +52,7 @@ public class MotivoCancelacionHibernateDAO extends GenericHibernateDAO obtenerTodosTipoMotivoB() { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); c.add(Restrictions.eq("tipomotivo", "B")); c.addOrder(Order.asc("descmotivo")); @@ -61,7 +61,7 @@ public class MotivoCancelacionHibernateDAO extends GenericHibernateDAO obtenerTodosEspecificos(Integer[] motivos) { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); c.add(Restrictions.in("motivocancelacionId", motivos)); c.addOrder(Order.asc("descmotivo")); diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/MotivoDevolucaoBilheteHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/MotivoDevolucaoBilheteHibernateDAO.java index 1387f1414..61f9eed2d 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/MotivoDevolucaoBilheteHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/MotivoDevolucaoBilheteHibernateDAO.java @@ -31,7 +31,7 @@ public class MotivoDevolucaoBilheteHibernateDAO extends GenericHibernateDAO obtenerTodos() { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); c.addOrder(Order.asc("descmotivo")); return c.list(); @@ -39,7 +39,7 @@ public class MotivoDevolucaoBilheteHibernateDAO extends GenericHibernateDAO buscar(String descmotivo, String tipomotivo) { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); c.add(Restrictions.eq("descmotivo", descmotivo)); @@ -48,7 +48,7 @@ public class MotivoDevolucaoBilheteHibernateDAO extends GenericHibernateDAO obtenerTodosTipoMotivoB() { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); c.addOrder(Order.asc("descmotivo")); return c.list(); @@ -56,7 +56,7 @@ public class MotivoDevolucaoBilheteHibernateDAO extends GenericHibernateDAO obtenerTodosEspecificos(Integer[] motivos) { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); c.add(Restrictions.in("motivodevolucaobilheteId", motivos)); c.addOrder(Order.asc("descmotivo")); diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/MotivoReimpresionHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/MotivoReimpresionHibernateDAO.java index b08c35878..6f781f60f 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/MotivoReimpresionHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/MotivoReimpresionHibernateDAO.java @@ -31,7 +31,7 @@ public class MotivoReimpresionHibernateDAO extends GenericHibernateDAO obtenerTodos() { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); c.addOrder(Order.asc("descmotivo")); return c.list(); @@ -39,7 +39,7 @@ public class MotivoReimpresionHibernateDAO extends GenericHibernateDAO buscar(String descmotivo) { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); c.add(Restrictions.eq("descmotivo", descmotivo)); return c.list(); diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/MotivoViajeHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/MotivoViajeHibernateDAO.java index 21fa984ca..c823d2991 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/MotivoViajeHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/MotivoViajeHibernateDAO.java @@ -31,7 +31,7 @@ public class MotivoViajeHibernateDAO extends GenericHibernateDAO obtenerTodos() { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); return c.list(); } diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/NodoHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/NodoHibernateDAO.java index 4b356e325..b3bc7e34b 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/NodoHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/NodoHibernateDAO.java @@ -31,7 +31,7 @@ public class NodoHibernateDAO extends GenericHibernateDAO @Override public List obtenerTodos() { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); c.addOrder(Order.asc("descnodo")); return c.list(); diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/OCDParamHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/OCDParamHibernateDAO.java index 560b92a64..b20c8cf66 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/OCDParamHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/OCDParamHibernateDAO.java @@ -28,7 +28,7 @@ public class OCDParamHibernateDAO extends GenericHibernateDAO @Override public List obtenerTodos() { - List params = findByCriteria(Restrictions.eq("activo", Boolean.TRUE)); + List params = findByCriteria(Restrictions.eq(ACTIVO, Boolean.TRUE)); return params; } @@ -37,14 +37,14 @@ public class OCDParamHibernateDAO extends GenericHibernateDAO Criteria c = makeCriteria(); c.add(Restrictions.eq("empresa", empresa)); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); return (OCDParam)c.uniqueResult(); } @Override public List buscaOCDParams(Empresa empresa) { - List params = findByCriteria(Restrictions.eq("empresa", empresa), Restrictions.eq("activo", Boolean.TRUE)); + List params = findByCriteria(Restrictions.eq("empresa", empresa), Restrictions.eq(ACTIVO, Boolean.TRUE)); return params; } diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/OCDPtoVtaParamHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/OCDPtoVtaParamHibernateDAO.java index c38962b7f..2ffe1dade 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/OCDPtoVtaParamHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/OCDPtoVtaParamHibernateDAO.java @@ -34,7 +34,7 @@ implements OCDPtoVtaParamDAO { @Override public List obtenerTodos() { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); c.addOrder(Order.asc("ptoVtaCheckinId")); return c.list(); @@ -42,7 +42,7 @@ implements OCDPtoVtaParamDAO { public List buscar(int id) { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); c.add(Restrictions.eq("ptoVtaCheckinId", id)); return c.list(); diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/OperadorEmbarcadaHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/OperadorEmbarcadaHibernateDAO.java index d298e6bca..c1288d312 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/OperadorEmbarcadaHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/OperadorEmbarcadaHibernateDAO.java @@ -33,7 +33,7 @@ public class OperadorEmbarcadaHibernateDAO extends GenericHibernateDAO buscarTodosOperadores() { start = System.currentTimeMillis(); Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); List retorno = c.list(); log.debug( printInfo("buscarOperadorEmbarcadaPorUsuario", start)); @@ -44,7 +44,7 @@ public class OperadorEmbarcadaHibernateDAO extends GenericHibernateDAO obtenerTodos() { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); c.addOrder(Order.asc("descOrgao")); return c.list(); @@ -37,7 +37,7 @@ public class OrgaoCancelacionHibernateDAO extends GenericHibernateDAO obtenerTodosIds() { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); c.setProjection(Projections.property("orgaoCancelacionId")); return c.list(); @@ -48,7 +48,7 @@ public class OrgaoCancelacionHibernateDAO extends GenericHibernateDAO buscarPorOrgao(OrgaoConcedente orgaoConcedente) { Criteria c = getSession().createCriteria(getPersistentClass()); c.add(Restrictions.like("orgao", orgaoConcedente)); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); return c.list(); } diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/OrgaoComprovanteCustomizadoHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/OrgaoComprovanteCustomizadoHibernateDAO.java index bbeec958d..8633585e1 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/OrgaoComprovanteCustomizadoHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/OrgaoComprovanteCustomizadoHibernateDAO.java @@ -25,7 +25,7 @@ public class OrgaoComprovanteCustomizadoHibernateDAO extends GenericHibernateDAO @Override public List obtenerTodos() { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); return c.list(); } @@ -33,7 +33,7 @@ public class OrgaoComprovanteCustomizadoHibernateDAO extends GenericHibernateDAO public List buscarOrgaoPorOgao(OrgaoConcedente orgaoConcedente) { Criteria c = getSession().createCriteria(getPersistentClass()); c.add(Restrictions.eq("orgaoConcedente", orgaoConcedente)); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); return c.list(); } @@ -41,7 +41,7 @@ public class OrgaoComprovanteCustomizadoHibernateDAO extends GenericHibernateDAO @Override public OrgaoComprovanteCustomizado buscarPorOrgao(OrgaoConcedente orgaoConcedente, String cveTipoComprovante) { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); c.add(Restrictions.eq("orgaoConcedente", orgaoConcedente)); c.add(Restrictions.eq("cveTipoComprovante", cveTipoComprovante)); diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/OrgaoConcedenteHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/OrgaoConcedenteHibernateDAO.java index c6993a3ba..9f97c59f3 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/OrgaoConcedenteHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/OrgaoConcedenteHibernateDAO.java @@ -26,7 +26,7 @@ public class OrgaoConcedenteHibernateDAO extends GenericHibernateDAO obtenerTodos() { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); c.addOrder(Order.asc("descOrgao")); return c.list(); @@ -34,7 +34,7 @@ public class OrgaoConcedenteHibernateDAO extends GenericHibernateDAO obtenerTodosExceto(Integer... id) { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); c.addOrder(Order.asc("descOrgao")); c.add(Restrictions.not(Restrictions.in("orgaoConcedenteId", id))); @@ -44,7 +44,7 @@ public class OrgaoConcedenteHibernateDAO extends GenericHibernateDAO obtenerTodosIds() { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); c.setProjection(Projections.property("orgaoConcedenteId")); return c.list(); @@ -54,7 +54,7 @@ public class OrgaoConcedenteHibernateDAO extends GenericHibernateDAO buscar(String desc) { Criteria c = getSession().createCriteria(getPersistentClass()); c.add(Restrictions.like("descOrgao", desc)); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); return c.list(); } @@ -63,7 +63,7 @@ public class OrgaoConcedenteHibernateDAO extends GenericHibernateDAO buscarListaPorIds(List orgaoConcedenteIds) { Criteria c = this.makeCriteria(); c.add(Restrictions.in("orgaoConcedenteId", orgaoConcedenteIds)); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); return c.list(); } diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/OrgaoEmpParamHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/OrgaoEmpParamHibernateDAO.java index cc91d6bd2..69e771d24 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/OrgaoEmpParamHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/OrgaoEmpParamHibernateDAO.java @@ -49,7 +49,7 @@ public class OrgaoEmpParamHibernateDAO extends GenericHibernateDAO obtenerTodos() { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); return c.list(); } @@ -32,7 +32,7 @@ public class PacoteConvenioHibernateDAO extends GenericHibernateDAO buscar(String nomconvenio) { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); c.add(Restrictions.eq("nomconvenio", nomconvenio)); diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/PacoteHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/PacoteHibernateDAO.java index 95e04bf62..945c4e819 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/PacoteHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/PacoteHibernateDAO.java @@ -24,7 +24,7 @@ public class PacoteHibernateDAO extends GenericHibernateDAO imp @SuppressWarnings("unchecked") public List obtenerTodos() { Criteria c = this.makeCriteria(); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); return c.list(); } diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/PaisHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/PaisHibernateDAO.java index 5ef92d6b0..568d162ee 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/PaisHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/PaisHibernateDAO.java @@ -31,7 +31,7 @@ public class PaisHibernateDAO extends GenericHibernateDAO @Override public List obtenerTodos() { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); c.addOrder(Order.asc("nombpais")); return c.list(); @@ -39,7 +39,7 @@ public class PaisHibernateDAO extends GenericHibernateDAO public List buscar(String nombpais) { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); c.add(Restrictions.eq("nombpais", nombpais)); return c.list(); diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/ParadaEquivalenciaHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/ParadaEquivalenciaHibernateDAO.java index 5c076d04a..2fe8b5754 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/ParadaEquivalenciaHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/ParadaEquivalenciaHibernateDAO.java @@ -37,7 +37,7 @@ public class ParadaEquivalenciaHibernateDAO c.add(Restrictions.eq("comisionistaExterno", comisionistaExterno)); c.add(Restrictions.eq("equivalenciaId", equivalencia)); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); return c.list(); } @@ -45,7 +45,7 @@ public class ParadaEquivalenciaHibernateDAO public List buscarEquivalencia(String equivalencia) { Criteria c = getSession().createCriteria(getPersistentClass()); c.add(Restrictions.eq("equivalenciaId", equivalencia)); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); return c.list(); } } diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/ParadaHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/ParadaHibernateDAO.java index 1fd09ae66..a56edbc10 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/ParadaHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/ParadaHibernateDAO.java @@ -48,7 +48,7 @@ public class ParadaHibernateDAO extends GenericHibernateDAO imp @Override public List obtenerTodos() { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); c.addOrder(Order.asc("descparada")); @@ -57,7 +57,7 @@ public class ParadaHibernateDAO extends GenericHibernateDAO imp public List buscar(String descparada, String cveparada, Ciudad ciudad, TipoParada tipoParada, Nodo nodo) { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); c.add(Restrictions.eq("descparada", descparada)); c.add(Restrictions.eq("cveparada", cveparada)); @@ -70,7 +70,7 @@ public class ParadaHibernateDAO extends GenericHibernateDAO imp public List buscar(String descparada) { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); c.add(Restrictions.eq("descparada", descparada)); @@ -79,7 +79,7 @@ public class ParadaHibernateDAO extends GenericHibernateDAO imp public List buscarCVE(String cveparada) { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); c.add(Restrictions.eq("cveparada", cveparada)); @@ -88,7 +88,7 @@ public class ParadaHibernateDAO extends GenericHibernateDAO imp public List buscaLike(String descparada) { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); c.add(Restrictions.like("descparada", descparada, MatchMode.START)); c.addOrder(Order.asc("descparada")); @@ -100,7 +100,7 @@ public class ParadaHibernateDAO extends GenericHibernateDAO imp Criteria c = this.makeCriteria(); c.add(Restrictions.eq("tipoParada", tipoParada)); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); c.setProjection(Projections.rowCount()); @@ -111,7 +111,7 @@ public class ParadaHibernateDAO extends GenericHibernateDAO imp @Override public List buscar(Integer codAntt) { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); c.add(Restrictions.eq("codantt", codAntt)); return c.list(); @@ -123,7 +123,7 @@ public class ParadaHibernateDAO extends GenericHibernateDAO imp c.createAlias("tramoOrigemList", "tramo"); c.createAlias("tramo.rutaCombinacionList", "rutaCombinacion"); c.createAlias("rutaCombinacion.ruta", "ruta"); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); c.add(Restrictions.eq("ruta.rutaId", ruta.getRutaId())); c.setResultTransformer(Criteria.DISTINCT_ROOT_ENTITY); @@ -135,25 +135,25 @@ public class ParadaHibernateDAO extends GenericHibernateDAO imp public List obtenerOrigenPorListRutaIds(Integer orgaoConcendenteId, Integer empresaId,Integer[] listRuta) { Criteria c = getSession().createCriteria(getPersistentClass()); Criteria criteriaTramo =c.createCriteria("tramoOrigemList"); - criteriaTramo.add(Restrictions.eq("activo", Boolean.TRUE)); + criteriaTramo.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); Criteria criteriaRutaCombinacionList =criteriaTramo.createCriteria("rutaCombinacionList"); - criteriaRutaCombinacionList.add(Restrictions.eq("activo", Boolean.TRUE)); + criteriaRutaCombinacionList.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); Criteria criteriaRuta = criteriaRutaCombinacionList.createCriteria("ruta"); - criteriaRuta.add(Restrictions.eq("activo", Boolean.TRUE)); + criteriaRuta.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); if(null!=orgaoConcendenteId) { Criteria criteriaOrgaoConcendente = criteriaRuta.createCriteria("orgaoConcedente"); criteriaOrgaoConcendente.add(Restrictions.eq("orgaoConcendenteID", orgaoConcendenteId)); - criteriaOrgaoConcendente.add(Restrictions.eq("activo", Boolean.TRUE)); + criteriaOrgaoConcendente.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); } if(null!=empresaId) { Criteria criteriaRutaEmpresa = criteriaRuta.createCriteria("lsRutaEmpresa"); criteriaRutaEmpresa.add(Restrictions.eq("empresaId", empresaId)); - criteriaRutaEmpresa.add(Restrictions.eq("activo", Boolean.TRUE)); + criteriaRutaEmpresa.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); } - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); if(null!=listRuta) { criteriaRuta.add(Restrictions.in("rutaId", listRuta)); } @@ -248,7 +248,7 @@ public class ParadaHibernateDAO extends GenericHibernateDAO imp public List buscaParadaRegionMetropolitana(RegionMetropolitana regionMetropolitana) { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); c.add(Restrictions.eq("regionMetropolitana.regionMetropolitanaId", regionMetropolitana.getRegionMetropolitanaId())); return c.list(); } @@ -257,7 +257,7 @@ public class ParadaHibernateDAO extends GenericHibernateDAO imp public List buscarListaPorIds(List paradaIds) { Criteria c = this.makeCriteria(); c.add(Restrictions.in("paradaId", paradaIds)); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); return c.list(); } @@ -266,7 +266,7 @@ public class ParadaHibernateDAO extends GenericHibernateDAO imp public Parada buscarPorId(Integer paradaId) { Criteria c = this.makeCriteria(); c.add(Restrictions.eq("paradaId", paradaId)); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); return (Parada) c.uniqueResult(); } @@ -276,7 +276,7 @@ public class ParadaHibernateDAO extends GenericHibernateDAO imp if(agrupamentoParada !=null && agrupamentoParada.getAgrupamentoParadaId() !=null) { Criteria c = this.makeCriteria(); c.add(Restrictions.eq("agrupamentoParada", agrupamentoParada)); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); return c.list(); } diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/ParamAcumulaMasivoHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/ParamAcumulaMasivoHibernateDAO.java index 980ea657a..14797b508 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/ParamAcumulaMasivoHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/ParamAcumulaMasivoHibernateDAO.java @@ -34,7 +34,7 @@ public class ParamAcumulaMasivoHibernateDAO extends GenericHibernateDAO buscar(Empresa emp, Integer min, Integer max, Date fecIni, Date fecFim) { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); if (emp != null) { c.add(Restrictions.eq("empresa", emp)); @@ -58,7 +58,7 @@ public class ParamAcumulaMasivoHibernateDAO extends GenericHibernateDAO buscar(ParamAcumulaMasivo paramAcumulaMasivo) { Criteria c = this.getSession().createCriteria(ParamAcumulaMasivo.class); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); c.add(Restrictions.ge("fecfinvigencia", paramAcumulaMasivo.getFeciniciovigencia())); c.add(Restrictions.le("feciniciovigencia", paramAcumulaMasivo.getFecfinvigencia())); c.add(Restrictions.eq("empresa", paramAcumulaMasivo.getEmpresa())); diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/ParamAcumulaPuntoHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/ParamAcumulaPuntoHibernateDAO.java index 270949863..ddd5d107b 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/ParamAcumulaPuntoHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/ParamAcumulaPuntoHibernateDAO.java @@ -31,7 +31,7 @@ public class ParamAcumulaPuntoHibernateDAO extends GenericHibernateDAO buscar(Parada origem, Parada destino, Date ini, Date fim) { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); if (origem != null) { c.add(Restrictions.eq("origem", origem)); diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/ParamArticuloHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/ParamArticuloHibernateDAO.java index cabde53f8..6f759b8a3 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/ParamArticuloHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/ParamArticuloHibernateDAO.java @@ -24,7 +24,7 @@ public class ParamArticuloHibernateDAO extends @Override public List obtenerTodos() { Criteria c = getSession().createCriteria(getPersistentClass()); - // c.add(Restrictions.eq("activo", Boolean.TRUE)); + // c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); return c.list(); } diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/ParamCanjePuntoHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/ParamCanjePuntoHibernateDAO.java index 3347d5dd7..11b31782a 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/ParamCanjePuntoHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/ParamCanjePuntoHibernateDAO.java @@ -31,7 +31,7 @@ public class ParamCanjePuntoHibernateDAO extends GenericHibernateDAO buscar(Parada origem, Parada destino, Date ini, Date fim) { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); if (origem != null) { c.add(Restrictions.eq("origem", origem)); diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/ParamCompraPuntoHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/ParamCompraPuntoHibernateDAO.java index fe4818a95..60eab4442 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/ParamCompraPuntoHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/ParamCompraPuntoHibernateDAO.java @@ -31,7 +31,7 @@ public class ParamCompraPuntoHibernateDAO extends GenericHibernateDAO buscar(Date ini, Date fim) { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); if (ini != null) { c.add(Restrictions.ge("feciniciovigencia", ini)); @@ -46,7 +46,7 @@ public class ParamCompraPuntoHibernateDAO extends GenericHibernateDAO buscar(Date ini, Date fim, Integer cantPuntos, BigDecimal costoPunto) { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); if (ini != null) { c.add(Restrictions.eq("feciniciovigencia", ini)); diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/ParamCostoTarjetaHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/ParamCostoTarjetaHibernateDAO.java index bbf14d191..abf1439ae 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/ParamCostoTarjetaHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/ParamCostoTarjetaHibernateDAO.java @@ -31,7 +31,7 @@ public class ParamCostoTarjetaHibernateDAO extends GenericHibernateDAO buscar(ParamCostoTarjeta paramCostoTarjeta) { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); c.add(Restrictions.eq("empresa", paramCostoTarjeta.getEmpresa())); c.add(Restrictions.eq("valcostoinicial", paramCostoTarjeta.getValcostoinicial())); diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/PerfilFuncionHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/PerfilFuncionHibernateDAO.java index e7776d323..961f6ac48 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/PerfilFuncionHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/PerfilFuncionHibernateDAO.java @@ -33,7 +33,7 @@ public class PerfilFuncionHibernateDAO extends GenericHibernateDAO obtenerTodos() { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); return c.list(); } diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/PerfilHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/PerfilHibernateDAO.java index d42ecb573..d71855121 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/PerfilHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/PerfilHibernateDAO.java @@ -57,7 +57,7 @@ public class PerfilHibernateDAO extends GenericHibernateDAO @Override public List obtenerTodos() { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); c.add(Restrictions.not(Restrictions.eq("descperfil", "RJ"))); c.addOrder(Order.asc("descperfil")); @@ -66,7 +66,7 @@ public class PerfilHibernateDAO extends GenericHibernateDAO public List buscar(String dscPerfil) { - return this.findByCriteria(Restrictions.eq("descperfil", dscPerfil.trim()), Restrictions.eq("activo", Boolean.TRUE)); + return this.findByCriteria(Restrictions.eq("descperfil", dscPerfil.trim()), Restrictions.eq(ACTIVO, Boolean.TRUE)); } } diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/PeriodoVacacionalHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/PeriodoVacacionalHibernateDAO.java index a76679158..6f5dd774f 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/PeriodoVacacionalHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/PeriodoVacacionalHibernateDAO.java @@ -34,7 +34,7 @@ public class PeriodoVacacionalHibernateDAO extends GenericHibernateDAO obtenerTodos() { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); return c.list(); } @@ -42,7 +42,7 @@ public class PeriodoVacacionalHibernateDAO extends GenericHibernateDAO buscar(Date dataInicio, Date dataFim) { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); c.add(Restrictions.eq("fecinicio", dataInicio)); c.add(Restrictions.eq("fecfinal", dataFim)); @@ -54,7 +54,7 @@ public class PeriodoVacacionalHibernateDAO extends GenericHibernateDAO buscarFechaTraslapa(PeriodoVacacional periodoVacacional) { Criteria c = this.getSession().createCriteria(PeriodoVacacional.class); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); c.add(Restrictions.ge("fecfinal", periodoVacacional.getFecinicio())); c.add(Restrictions.le("fecinicio", periodoVacacional.getFecfinal())); diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/PlazaHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/PlazaHibernateDAO.java index 6be8cf105..d9a976a20 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/PlazaHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/PlazaHibernateDAO.java @@ -31,7 +31,7 @@ public class PlazaHibernateDAO extends GenericHibernateDAO @Override public List obtenerTodos() { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); c.addOrder(Order.asc("nombplaza")); return c.list(); @@ -39,7 +39,7 @@ public class PlazaHibernateDAO extends GenericHibernateDAO public List buscar(String nombplaza) { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); c.add(Restrictions.eq("nombplaza", nombplaza)); return c.list(); diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/PrecioFixoPedagioHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/PrecioFixoPedagioHibernateDAO.java index 7bef35ca3..20de0c7c2 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/PrecioFixoPedagioHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/PrecioFixoPedagioHibernateDAO.java @@ -34,7 +34,7 @@ public class PrecioFixoPedagioHibernateDAO extends GenericHibernateDAO obtenerTodos() { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); // c.addOrder(Order.asc("descclase")); return c.list(); @@ -59,7 +59,7 @@ public class PrecioFixoPedagioHibernateDAO extends GenericHibernateDAO buscarPorNome(String nomeClaseServicio) { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); c.add(Restrictions.eq("descclase", nomeClaseServicio)); return c.list(); @@ -70,7 +70,7 @@ public class PrecioFixoPedagioHibernateDAO extends GenericHibernateDAO buscarPrecioFixoPedagio(PrecioFixoPedagio obj) { Criteria c = getSession().createCriteria(getPersistentClass()); c.add(Restrictions.eq("pracaPedagioId.casetaPeajeId", obj.getPracaPedagioId().getCasetaPeajeId())); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); if(obj.getOrgaoConcedenteId() != null){ c.add(Restrictions.eq("orgaoConcedenteId.orgaoConcedenteId", obj.getOrgaoConcedenteId().getOrgaoConcedenteId())); } diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/PrecoApanheHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/PrecoApanheHibernateDAO.java index 5def1d8eb..61aa1e0c5 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/PrecoApanheHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/PrecoApanheHibernateDAO.java @@ -25,7 +25,7 @@ public class PrecoApanheHibernateDAO extends GenericHibernateDAO obtenerTodos() { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); return c.list(); } @@ -33,7 +33,7 @@ public class PrecoApanheHibernateDAO extends GenericHibernateDAO buscar(String deschotel, String desccolonia, String nombciudad) { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); if(StringUtils.isNotBlank(deschotel)) { c.add(Restrictions.eq("hotel.deschotel", deschotel)); diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/PricingAsientoHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/PricingAsientoHibernateDAO.java index 82e0a5fe5..f5198c1c2 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/PricingAsientoHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/PricingAsientoHibernateDAO.java @@ -31,14 +31,14 @@ public class PricingAsientoHibernateDAO extends GenericHibernateDAO obtenerTodos() { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Pricing.ATIVO)); + c.add(Restrictions.eq(ACTIVO, Pricing.ATIVO)); return c.list(); } public List obtenerPricingCategoria(Pricing pricing, String asiento) { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Pricing.ATIVO)); + c.add(Restrictions.eq(ACTIVO, Pricing.ATIVO)); c.add(Restrictions.eq("pricing", pricing)); c.add(Restrictions.eq("numeasiento", asiento.toString())); diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/PricingCategoriaHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/PricingCategoriaHibernateDAO.java index 4ed618cc1..2b3c69086 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/PricingCategoriaHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/PricingCategoriaHibernateDAO.java @@ -32,14 +32,14 @@ public class PricingCategoriaHibernateDAO extends GenericHibernateDAO obtenerTodos() { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Pricing.ATIVO)); + c.add(Restrictions.eq(ACTIVO, Pricing.ATIVO)); return c.list(); } public Boolean obtenerPricingCategoria(Pricing pricing, Categoria categoria) { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Pricing.ATIVO)); + c.add(Restrictions.eq(ACTIVO, Pricing.ATIVO)); c.add(Restrictions.eq("pricing", pricing)); c.add(Restrictions.eq("categoria", categoria)); diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/PricingClaseHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/PricingClaseHibernateDAO.java index 2c21c86a2..87679cdee 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/PricingClaseHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/PricingClaseHibernateDAO.java @@ -32,14 +32,14 @@ public class PricingClaseHibernateDAO extends GenericHibernateDAO obtenerTodos() { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Pricing.ATIVO)); + c.add(Restrictions.eq(ACTIVO, Pricing.ATIVO)); return c.list(); } public Boolean obtenerPricingClase(Pricing pricing, ClaseServicio claseServicio) { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Pricing.ATIVO)); + c.add(Restrictions.eq(ACTIVO, Pricing.ATIVO)); c.add(Restrictions.eq("pricing", pricing)); c.add(Restrictions.eq("claseServicio", claseServicio)); diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/PricingClasseTarifariaHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/PricingClasseTarifariaHibernateDAO.java index b396e1bb3..5bb2b4eff 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/PricingClasseTarifariaHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/PricingClasseTarifariaHibernateDAO.java @@ -26,7 +26,7 @@ public class PricingClasseTarifariaHibernateDAO extends GenericHibernateDAO obtenerTodos() { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); return c.list(); } diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/PricingCorridaHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/PricingCorridaHibernateDAO.java index fd2868e39..a1c5e9d0c 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/PricingCorridaHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/PricingCorridaHibernateDAO.java @@ -32,14 +32,14 @@ public class PricingCorridaHibernateDAO extends GenericHibernateDAO obtenerTodos() { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Pricing.ATIVO)); + c.add(Restrictions.eq(ACTIVO, Pricing.ATIVO)); return c.list(); } public Boolean obtenerPricingCorrida(Pricing pricing, CorridaCtrl corrida) { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Pricing.ATIVO)); + c.add(Restrictions.eq(ACTIVO, Pricing.ATIVO)); c.add(Restrictions.eq("pricing", pricing)); c.add(Restrictions.eq("corridaCtrl", corrida)); diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/PricingCtrlHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/PricingCtrlHibernateDAO.java index a529b6d5b..bb0666732 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/PricingCtrlHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/PricingCtrlHibernateDAO.java @@ -24,14 +24,14 @@ public class PricingCtrlHibernateDAO extends GenericHibernateDAO obtenerTodos() { Criteria c = this.makeCriteria(); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); return c.list(); } @Override public PricingCtrl obtenerPricingCtrl() { Criteria c = this.makeCriteria(); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); c.setMaxResults(1); return (PricingCtrl) c.uniqueResult(); } diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/PricingDiaHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/PricingDiaHibernateDAO.java index 18836fc65..fa6a079d4 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/PricingDiaHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/PricingDiaHibernateDAO.java @@ -40,7 +40,7 @@ public class PricingDiaHibernateDAO extends GenericHibernateDAO obtenerTodos() { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Pricing.ATIVO)); + c.add(Restrictions.eq(ACTIVO, Pricing.ATIVO)); return c.list(); } diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/PricingEspecificoAgenciaHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/PricingEspecificoAgenciaHibernateDAO.java index 87ef0b718..8f6e954e3 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/PricingEspecificoAgenciaHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/PricingEspecificoAgenciaHibernateDAO.java @@ -25,7 +25,7 @@ public class PricingEspecificoAgenciaHibernateDAO extends GenericHibernateDAO obtenerTodos() { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); return c.list(); } @@ -33,7 +33,7 @@ public class PricingEspecificoAgenciaHibernateDAO extends GenericHibernateDAO obtenerTodos() { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); return c.list(); } @@ -33,7 +33,7 @@ public class PricingEspecificoCanalVendasHibernateDAO extends GenericHibernateDA @Override public Boolean isDuplicado(PricingEspecificoCanalVendas entidad) { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); c.add(Restrictions.eq("tipoPtovta.tipoptovtaId", entidad.getTipoPtovta().getTipoptovtaId())); return c.list().isEmpty(); diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/PricingEspecificoCategoriaHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/PricingEspecificoCategoriaHibernateDAO.java index 24b1c6a82..c63af2fcf 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/PricingEspecificoCategoriaHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/PricingEspecificoCategoriaHibernateDAO.java @@ -24,7 +24,7 @@ public class PricingEspecificoCategoriaHibernateDAO extends GenericHibernateDAO< @Override public List obtenerTodos() { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); return c.list(); } @@ -32,7 +32,7 @@ public class PricingEspecificoCategoriaHibernateDAO extends GenericHibernateDAO< @Override public Boolean isDuplicado(PricingEspecificoCategoria entidad) { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); c.add(Restrictions.eq("categoria.categoriaId", entidad.getCategoria().getCategoriaId())); return c.list().isEmpty(); diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/PricingEspecificoHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/PricingEspecificoHibernateDAO.java index e95532c9f..4ee894ee7 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/PricingEspecificoHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/PricingEspecificoHibernateDAO.java @@ -40,14 +40,14 @@ public class PricingEspecificoHibernateDAO extends GenericHibernateDAO obtenerTodos() { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); return c.list(); } public List buscarPorNome(PricingEspecifico pricingEspecifico) { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); c.add(Restrictions.eq("nombPricing", pricingEspecifico.getNombPricing())); return c.list(); @@ -56,7 +56,7 @@ public class PricingEspecificoHibernateDAO extends GenericHibernateDAO buscarPorNome(String nome) { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); c.add(Restrictions.eq("nombPricing", nome)); return c.list(); diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/PricingEspecificoOcupacionHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/PricingEspecificoOcupacionHibernateDAO.java index 4fb77ee0e..96bdc73ee 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/PricingEspecificoOcupacionHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/PricingEspecificoOcupacionHibernateDAO.java @@ -25,7 +25,7 @@ public class PricingEspecificoOcupacionHibernateDAO extends GenericHibernateDAO< @Override public List obtenerTodos() { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); return c.list(); } diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/PricingHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/PricingHibernateDAO.java index 6d03d9084..363a89f81 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/PricingHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/PricingHibernateDAO.java @@ -39,7 +39,7 @@ public class PricingHibernateDAO extends GenericHibernateDAO @Override public List obtenerTodos() { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Pricing.ATIVO)); + c.add(Restrictions.eq(ACTIVO, Pricing.ATIVO)); return c.list(); } @@ -49,7 +49,7 @@ public class PricingHibernateDAO extends GenericHibernateDAO BigDecimal descuentoporcentaje, BigDecimal descuentoporcredondo) { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Pricing.ATIVO)); + c.add(Restrictions.eq(ACTIVO, Pricing.ATIVO)); c.add(Restrictions.eq("nombPricing", nombPricing)); c.add(Restrictions.eq("empresa", empresa)); @@ -67,7 +67,7 @@ public class PricingHibernateDAO extends GenericHibernateDAO public List buscarPorNombre(String nombPricing) { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Pricing.ATIVO)); + c.add(Restrictions.eq(ACTIVO, Pricing.ATIVO)); c.add(Restrictions.eq("nombPricing", nombPricing)); diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/PricingImporteHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/PricingImporteHibernateDAO.java index 7b980e97b..d8abc610d 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/PricingImporteHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/PricingImporteHibernateDAO.java @@ -32,14 +32,14 @@ public class PricingImporteHibernateDAO extends GenericHibernateDAO obtenerTodos() { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Pricing.ATIVO)); + c.add(Restrictions.eq(ACTIVO, Pricing.ATIVO)); return c.list(); } public List buscarMoneda(PricingImporte pricingImporte, Moneda moneda) { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Pricing.ATIVO)); + c.add(Restrictions.eq(ACTIVO, Pricing.ATIVO)); c.add(Restrictions.eq("pricing", pricingImporte.getPricing())); c.add(Restrictions.eq("moneda", moneda)); diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/PricingMarcaHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/PricingMarcaHibernateDAO.java index 89759ffaa..1fe0ca921 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/PricingMarcaHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/PricingMarcaHibernateDAO.java @@ -32,14 +32,14 @@ public class PricingMarcaHibernateDAO extends GenericHibernateDAO obtenerTodos() { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Pricing.ATIVO)); + c.add(Restrictions.eq(ACTIVO, Pricing.ATIVO)); return c.list(); } public Boolean obtenerPricingMarca(Pricing pricing, Marca marca) { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Pricing.ATIVO)); + c.add(Restrictions.eq(ACTIVO, Pricing.ATIVO)); c.add(Restrictions.eq("pricing", pricing)); c.add(Restrictions.eq("marca", marca)); diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/PricingMercadoHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/PricingMercadoHibernateDAO.java index 5b6522272..af80c5469 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/PricingMercadoHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/PricingMercadoHibernateDAO.java @@ -32,14 +32,14 @@ public class PricingMercadoHibernateDAO extends GenericHibernateDAO obtenerTodos() { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Pricing.ATIVO)); + c.add(Restrictions.eq(ACTIVO, Pricing.ATIVO)); return c.list(); } public Boolean obtenerPricingMercado(Pricing pricing, Parada origen, Parada destino) { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Pricing.ATIVO)); + c.add(Restrictions.eq(ACTIVO, Pricing.ATIVO)); c.add(Restrictions.eq("pricing", pricing)); c.add(Restrictions.eq("origen", origen)); c.add(Restrictions.eq("destino", destino)); diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/PricingOcupaAntecipaHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/PricingOcupaAntecipaHibernateDAO.java index 0393f7151..f3dd5bbb6 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/PricingOcupaAntecipaHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/PricingOcupaAntecipaHibernateDAO.java @@ -33,14 +33,14 @@ public class PricingOcupaAntecipaHibernateDAO extends GenericHibernateDAO obtenerTodos() { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Pricing.ATIVO)); + c.add(Restrictions.eq(ACTIVO, Pricing.ATIVO)); return c.list(); } @Override public List buscarOcupaAntecipaPricing(Integer pricingId) { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.or(Restrictions.eq("activo", Pricing.ATIVO), Restrictions.eq("activo", Pricing.INATIVO))); + c.add(Restrictions.or(Restrictions.eq(ACTIVO, Pricing.ATIVO), Restrictions.eq(ACTIVO, Pricing.INATIVO))); c.add(Restrictions.eq("pricing.pricingId", pricingId)); return c.list(); diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/PricingPuntoVentaHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/PricingPuntoVentaHibernateDAO.java index 548307cd5..0b02aa3c4 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/PricingPuntoVentaHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/PricingPuntoVentaHibernateDAO.java @@ -33,14 +33,14 @@ public class PricingPuntoVentaHibernateDAO extends GenericHibernateDAO obtenerTodos() { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Pricing.ATIVO)); + c.add(Restrictions.eq(ACTIVO, Pricing.ATIVO)); return c.list(); } public Boolean obtenerPricingPuntoVenta(Pricing pricing, PuntoVenta puntoVenta) { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Pricing.ATIVO)); + c.add(Restrictions.eq(ACTIVO, Pricing.ATIVO)); c.add(Restrictions.eq("pricing", pricing)); c.add(Restrictions.eq("puntoVenta", puntoVenta)); diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/PricingRutaHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/PricingRutaHibernateDAO.java index e6bf77ab9..5b95c7fe1 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/PricingRutaHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/PricingRutaHibernateDAO.java @@ -32,14 +32,14 @@ public class PricingRutaHibernateDAO extends GenericHibernateDAO obtenerTodos() { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Pricing.ATIVO)); + c.add(Restrictions.eq(ACTIVO, Pricing.ATIVO)); return c.list(); } public Boolean obtenerPricingRuta(Pricing pricing, Ruta ruta) { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Pricing.ATIVO)); + c.add(Restrictions.eq(ACTIVO, Pricing.ATIVO)); c.add(Restrictions.eq("pricing", pricing)); c.add(Restrictions.eq("ruta", ruta)); diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/PricingTipoPtoVtaHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/PricingTipoPtoVtaHibernateDAO.java index 4ef62278c..5443a28b1 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/PricingTipoPtoVtaHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/PricingTipoPtoVtaHibernateDAO.java @@ -32,14 +32,14 @@ public class PricingTipoPtoVtaHibernateDAO extends GenericHibernateDAO obtenerTodos() { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Pricing.ATIVO)); + c.add(Restrictions.eq(ACTIVO, Pricing.ATIVO)); return c.list(); } public Boolean obtenerPricingTipoPuntoVenta(Pricing pricing, TipoPuntoVenta tipoPuntoVenta) { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Pricing.ATIVO)); + c.add(Restrictions.eq(ACTIVO, Pricing.ATIVO)); c.add(Restrictions.eq("pricing", pricing)); c.add(Restrictions.eq("tipoPtovta", tipoPuntoVenta)); diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/PricingTipoServicioHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/PricingTipoServicioHibernateDAO.java index 2d75e7eb1..17de1cc6a 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/PricingTipoServicioHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/PricingTipoServicioHibernateDAO.java @@ -32,14 +32,14 @@ public class PricingTipoServicioHibernateDAO extends GenericHibernateDAO obtenerTodos() { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Pricing.ATIVO)); + c.add(Restrictions.eq(ACTIVO, Pricing.ATIVO)); return c.list(); } public Boolean obtenerPricingTipoServicio(Pricing pricing, TipoServicio tipoServicio) { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Pricing.ATIVO)); + c.add(Restrictions.eq(ACTIVO, Pricing.ATIVO)); c.add(Restrictions.eq("pricing", pricing)); c.add(Restrictions.eq("tipoServicio", tipoServicio)); diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/PricingVigenciaHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/PricingVigenciaHibernateDAO.java index 315195b09..b6290238f 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/PricingVigenciaHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/PricingVigenciaHibernateDAO.java @@ -35,7 +35,7 @@ public class PricingVigenciaHibernateDAO extends GenericHibernateDAO obtenerTodos() { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Pricing.ATIVO)); + c.add(Restrictions.eq(ACTIVO, Pricing.ATIVO)); return c.list(); } @@ -44,7 +44,7 @@ public class PricingVigenciaHibernateDAO extends GenericHibernateDAO buscarPorVigencias(PricingVigencia pv) { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Pricing.ATIVO)); + c.add(Restrictions.eq(ACTIVO, Pricing.ATIVO)); c.add(Restrictions.eq("pricing", pv.getPricing())); @@ -70,7 +70,7 @@ public class PricingVigenciaHibernateDAO extends GenericHibernateDAO obtenerTodos() { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); return c.list(); } diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/ProdFormaPagoHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/ProdFormaPagoHibernateDAO.java index df9354378..ba0ca150b 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/ProdFormaPagoHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/ProdFormaPagoHibernateDAO.java @@ -30,7 +30,7 @@ public class ProdFormaPagoHibernateDAO extends GenericHibernateDAO obtenerTodos() { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); return c.list(); } diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/ProdMarcaHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/ProdMarcaHibernateDAO.java index df0d6101e..edff9511c 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/ProdMarcaHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/ProdMarcaHibernateDAO.java @@ -30,7 +30,7 @@ public class ProdMarcaHibernateDAO extends GenericHibernateDAO obtenerTodos() { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); return c.list(); } diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/ProdMercadoHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/ProdMercadoHibernateDAO.java index 4a243c125..3e68b1165 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/ProdMercadoHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/ProdMercadoHibernateDAO.java @@ -30,7 +30,7 @@ public class ProdMercadoHibernateDAO extends GenericHibernateDAO obtenerTodos() { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); return c.list(); } diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/ProdPrecioHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/ProdPrecioHibernateDAO.java index 0164e1cf9..253e890a6 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/ProdPrecioHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/ProdPrecioHibernateDAO.java @@ -38,7 +38,7 @@ public class ProdPrecioHibernateDAO extends GenericHibernateDAO obtenerTodos() { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); return c.list(); } @@ -47,7 +47,7 @@ public class ProdPrecioHibernateDAO extends GenericHibernateDAO buscar(Marca marca) { Criteria c = this.makeCriteria(); c.add(Restrictions.eq("marca", marca)); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); return c.list(); diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/ProdPuntoVentaHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/ProdPuntoVentaHibernateDAO.java index b705c2a6b..35200956e 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/ProdPuntoVentaHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/ProdPuntoVentaHibernateDAO.java @@ -30,7 +30,7 @@ public class ProdPuntoVentaHibernateDAO extends GenericHibernateDAO obtenerTodos() { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); return c.list(); } diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/ProdRutaHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/ProdRutaHibernateDAO.java index 5f63a56c4..83c4a3cf1 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/ProdRutaHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/ProdRutaHibernateDAO.java @@ -30,7 +30,7 @@ public class ProdRutaHibernateDAO extends GenericHibernateDAO @Override public List obtenerTodos() { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); return c.list(); } diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/ProdTipoptovtaHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/ProdTipoptovtaHibernateDAO.java index 054dcc695..54db43b07 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/ProdTipoptovtaHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/ProdTipoptovtaHibernateDAO.java @@ -30,7 +30,7 @@ public class ProdTipoptovtaHibernateDAO extends GenericHibernateDAO obtenerTodos() { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); return c.list(); } diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/ProdVigenciaHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/ProdVigenciaHibernateDAO.java index 11bb04c15..f060854fc 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/ProdVigenciaHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/ProdVigenciaHibernateDAO.java @@ -36,7 +36,7 @@ public class ProdVigenciaHibernateDAO extends GenericHibernateDAO obtenerTodos() { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); return c.list(); } @@ -44,7 +44,7 @@ public class ProdVigenciaHibernateDAO extends GenericHibernateDAO buscarTraslapa(ProdVigencia prodVigencia) { Criteria c = this.getSession().createCriteria(ProdVigencia.class); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); c.add(Restrictions.ge("fecvigenciafin", prodVigencia.getFecvigenciainicio())); c.add(Restrictions.le("fecvigenciainicio", prodVigencia.getFecvigenciafin())); c.add(Restrictions.eq("productoServicio", prodVigencia.getProductoServicio())); diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/ProductoServicioHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/ProductoServicioHibernateDAO.java index 11e440cad..df2da1f10 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/ProductoServicioHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/ProductoServicioHibernateDAO.java @@ -30,14 +30,14 @@ public class ProductoServicioHibernateDAO extends GenericHibernateDAO obtenerTodos() { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); return c.list(); } public List obtener(ProductoServicio ps) { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); c.add(Restrictions.eq("descproductoservicio", ps.getDescproductoservicio())); c.add(Restrictions.eq("empresa", ps.getEmpresa())); diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/PtoVtaCheckinHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/PtoVtaCheckinHibernateDAO.java index 5cc65eead..903d201e8 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/PtoVtaCheckinHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/PtoVtaCheckinHibernateDAO.java @@ -26,7 +26,7 @@ public class PtoVtaCheckinHibernateDAO extends GenericHibernateDAO obtenerTodos() { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); c.addOrder(Order.asc("ptoVtaCheckinId")); return c.list(); @@ -34,7 +34,7 @@ public class PtoVtaCheckinHibernateDAO extends GenericHibernateDAO buscar(int id) { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); c.add(Restrictions.eq("ptoVtaCheckinId", id)); return c.list(); diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/PtoVtaSeguroHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/PtoVtaSeguroHibernateDAO.java index b3d91e063..b5af5b346 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/PtoVtaSeguroHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/PtoVtaSeguroHibernateDAO.java @@ -26,7 +26,7 @@ public class PtoVtaSeguroHibernateDAO extends GenericHibernateDAO obtenerTodos() { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); c.addOrder(Order.asc("ptoVtaSeguroId")); return c.list(); @@ -34,7 +34,7 @@ public class PtoVtaSeguroHibernateDAO extends GenericHibernateDAO buscar(int id) { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); c.add(Restrictions.eq("ptoVtaSeguroId", id)); return c.list(); diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/PtoVtaUsuarioBancarioHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/PtoVtaUsuarioBancarioHibernateDAO.java index 858509fbb..700d73835 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/PtoVtaUsuarioBancarioHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/PtoVtaUsuarioBancarioHibernateDAO.java @@ -31,7 +31,7 @@ public class PtoVtaUsuarioBancarioHibernateDAO extends GenericHibernateDAO obtenerTodos() { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); return c.list(); } diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/PtovtaAgenciaHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/PtovtaAgenciaHibernateDAO.java index 5f871a4a0..b93235840 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/PtovtaAgenciaHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/PtovtaAgenciaHibernateDAO.java @@ -28,7 +28,7 @@ public class PtovtaAgenciaHibernateDAO extends GenericHibernateDAO obtenerTodos() { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); c.addOrder(Order.asc("numagencia")); return c.list(); @@ -36,7 +36,7 @@ public class PtovtaAgenciaHibernateDAO extends GenericHibernateDAO buscar(String numagencia) { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); c.add(Restrictions.eq("numagencia", numagencia)); diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/PtovtaAntecipacomissaoHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/PtovtaAntecipacomissaoHibernateDAO.java index 54d992f7d..a5bb93f0c 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/PtovtaAntecipacomissaoHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/PtovtaAntecipacomissaoHibernateDAO.java @@ -27,7 +27,7 @@ public class PtovtaAntecipacomissaoHibernateDAO extends GenericHibernateDAO obtenerTodos() { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); c.addOrder(Order.asc("id")); return c.list(); @@ -35,7 +35,7 @@ public class PtovtaAntecipacomissaoHibernateDAO extends GenericHibernateDAO buscar(int id) { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); c.add(Restrictions.eq("id", id)); diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/PtovtaComissaoHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/PtovtaComissaoHibernateDAO.java index 121894f12..ac21accd1 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/PtovtaComissaoHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/PtovtaComissaoHibernateDAO.java @@ -28,7 +28,7 @@ public class PtovtaComissaoHibernateDAO extends GenericHibernateDAO obtenerTodos() { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); c.addOrder(Order.asc("id")); return c.list(); @@ -36,7 +36,7 @@ public class PtovtaComissaoHibernateDAO extends GenericHibernateDAO buscar(int id) { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); c.add(Restrictions.eq("id", id)); return c.list(); @@ -44,7 +44,7 @@ public class PtovtaComissaoHibernateDAO extends GenericHibernateDAO buscarByPuntaVenta(PuntoVenta puntaVenta) { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); c.add(Restrictions.eq("puntoventaId", puntaVenta)); c.addOrder(Order.asc("empresaId")); @@ -55,7 +55,7 @@ public class PtovtaComissaoHibernateDAO extends GenericHibernateDAO obtenerTodos() { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); return c.list(); } diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/PtovtaDiversosHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/PtovtaDiversosHibernateDAO.java index aaa53b1a6..421468a38 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/PtovtaDiversosHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/PtovtaDiversosHibernateDAO.java @@ -28,7 +28,7 @@ public class PtovtaDiversosHibernateDAO extends GenericHibernateDAO obtenerTodos() { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); c.addOrder(Order.asc("id")); return c.list(); @@ -36,7 +36,7 @@ public class PtovtaDiversosHibernateDAO extends GenericHibernateDAO buscar(int id) { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); c.add(Restrictions.eq("id", id)); diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/PtovtaEmpresaBloqueadaHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/PtovtaEmpresaBloqueadaHibernateDAO.java index 863df6fd8..596e4ac38 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/PtovtaEmpresaBloqueadaHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/PtovtaEmpresaBloqueadaHibernateDAO.java @@ -28,7 +28,7 @@ public class PtovtaEmpresaBloqueadaHibernateDAO extends GenericHibernateDAO obtenerTodos() { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); c.addOrder(Order.asc("ptovtaempbloqueadaId")); return c.list(); @@ -36,7 +36,7 @@ public class PtovtaEmpresaBloqueadaHibernateDAO extends GenericHibernateDAO buscar(int id) { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); c.add(Restrictions.eq("ptovtaempbloqueadaId", id)); diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/PtovtaEmpresaContaBancariaHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/PtovtaEmpresaContaBancariaHibernateDAO.java index d7066dbce..f852cbe29 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/PtovtaEmpresaContaBancariaHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/PtovtaEmpresaContaBancariaHibernateDAO.java @@ -31,7 +31,7 @@ public class PtovtaEmpresaContaBancariaHibernateDAO extends GenericHibernateDAO< @Override public List obtenerTodos() { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); return c.list(); } diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/PtovtaEmpresaHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/PtovtaEmpresaHibernateDAO.java index 825b89b14..d7a3cba1e 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/PtovtaEmpresaHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/PtovtaEmpresaHibernateDAO.java @@ -32,14 +32,14 @@ public class PtovtaEmpresaHibernateDAO extends GenericHibernateDAO obtenerTodos() { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); return c.list(); } public List buscar(PtovtaEmpresa ptovtaEmpresa) { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); c.add(Restrictions.eq("empresa", ptovtaEmpresa.getEmpresa())); c.add(Restrictions.eq("puntoVenta", ptovtaEmpresa.getPuntoVenta())); diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/PtovtaEstoqueHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/PtovtaEstoqueHibernateDAO.java index 6997af8a0..4b281e4cd 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/PtovtaEstoqueHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/PtovtaEstoqueHibernateDAO.java @@ -28,7 +28,7 @@ public class PtovtaEstoqueHibernateDAO extends GenericHibernateDAO obtenerTodos() { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); c.addOrder(Order.asc("id")); return c.list(); @@ -36,7 +36,7 @@ public class PtovtaEstoqueHibernateDAO extends GenericHibernateDAO buscar(int id) { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); c.add(Restrictions.eq("id", id)); diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/PtovtaHorarioHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/PtovtaHorarioHibernateDAO.java index 43d260e7f..23cc320a2 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/PtovtaHorarioHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/PtovtaHorarioHibernateDAO.java @@ -30,7 +30,7 @@ public class PtovtaHorarioHibernateDAO extends GenericHibernateDAO obtenerTodos() { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); c.addOrder(Order.asc("id")); return c.list(); @@ -38,7 +38,7 @@ public class PtovtaHorarioHibernateDAO extends GenericHibernateDAO buscar(int id) { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); c.add(Restrictions.eq("id", id)); diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/PtovtaTitularHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/PtovtaTitularHibernateDAO.java index 0a144dc9c..fa4a16b8d 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/PtovtaTitularHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/PtovtaTitularHibernateDAO.java @@ -29,7 +29,7 @@ public class PtovtaTitularHibernateDAO extends GenericHibernateDAO obtenerTodos() { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); c.addOrder(Order.asc("id")); return c.list(); @@ -37,7 +37,7 @@ public class PtovtaTitularHibernateDAO extends GenericHibernateDAO buscar(int id) { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); c.add(Restrictions.eq("id", id)); diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/PuntoVentaHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/PuntoVentaHibernateDAO.java index 16829eed7..bd4e3f40f 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/PuntoVentaHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/PuntoVentaHibernateDAO.java @@ -55,7 +55,7 @@ public class PuntoVentaHibernateDAO extends GenericHibernateDAO obtenerTodos() { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); c.addOrder(Order.asc("nombpuntoventa")); @@ -69,7 +69,7 @@ public class PuntoVentaHibernateDAO extends GenericHibernateDAO busca(String nomPuntoVenta, String numPuntoVenta) { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); c.add(Restrictions.eq("nombpuntoventa", nomPuntoVenta)); c.add(Restrictions.eq("numPuntoVenta", numPuntoVenta)); @@ -104,7 +104,7 @@ public class PuntoVentaHibernateDAO extends GenericHibernateDAO buscaPuntoVenta(String numPuntoVenta) { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); c.add(Restrictions.eq("numPuntoVenta", numPuntoVenta)); return c.list(); @@ -114,7 +114,7 @@ public class PuntoVentaHibernateDAO extends GenericHibernateDAO buscaPuntoVentaEmpresa(Empresa empresa) { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); c.add(Restrictions.eq("empresa", empresa)); return c.list(); @@ -124,7 +124,7 @@ public class PuntoVentaHibernateDAO extends GenericHibernateDAO buscaPuntoVentaParada(Parada parada) { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); c.add(Restrictions.eq("parada", parada)); c.addOrder(Order.asc("nombpuntoventa")); @@ -182,7 +182,7 @@ public class PuntoVentaHibernateDAO extends GenericHibernateDAO buscarPuntoVentaSubordinados(PuntoVenta puntoVenta) { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); c.add(Restrictions.eq("puntoVentaPadre", puntoVenta)); return c.list(); @@ -193,7 +193,7 @@ public class PuntoVentaHibernateDAO extends GenericHibernateDAO obtenerTodos() { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); return c.list(); } @@ -48,7 +48,7 @@ public class RedondeoCtrlHibernateDAO extends GenericHibernateDAO buscar(RedondeoCtrl redondeoCtrl) { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); List lsShort = new ArrayList(); for (RedondeoMarca rm : redondeoCtrl.getRedondeoMarcaList()) { diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/RedondeoHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/RedondeoHibernateDAO.java index 5da3d67f2..6824353ac 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/RedondeoHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/RedondeoHibernateDAO.java @@ -31,7 +31,7 @@ public class RedondeoHibernateDAO extends GenericHibernateDAO @Override public List obtenerTodos() { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); return c.list(); } @@ -39,7 +39,7 @@ public class RedondeoHibernateDAO extends GenericHibernateDAO public List buscar(BigDecimal valorInicial, BigDecimal valorFinal, BigDecimal valorRedondeo) { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); c.add(Restrictions.eq("valorinicial", valorInicial)); c.add(Restrictions.eq("valorfinal", valorFinal)); @@ -50,7 +50,7 @@ public class RedondeoHibernateDAO extends GenericHibernateDAO public List buscar(BigDecimal valorInicial, BigDecimal valorFinal) { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); c.add(Restrictions.ge("valorinicial", valorInicial)); c.add(Restrictions.le("valorfinal", valorFinal)); diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/RedondeoMarcaHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/RedondeoMarcaHibernateDAO.java index c701ab081..116131076 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/RedondeoMarcaHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/RedondeoMarcaHibernateDAO.java @@ -31,14 +31,14 @@ public class RedondeoMarcaHibernateDAO extends GenericHibernateDAO obtenerTodos() { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); return c.list(); } public List buscar(Marca marca) { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); c.add(Restrictions.eq("marca", marca)); @@ -47,7 +47,7 @@ public class RedondeoMarcaHibernateDAO extends GenericHibernateDAO obtenerTodasMarcas(Short[] iDMarcas) { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); c.add(Restrictions.in("marca.marcaId", iDMarcas)); diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/RegionMetropolitanaHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/RegionMetropolitanaHibernateDAO.java index 477e56a05..90b69fdc1 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/RegionMetropolitanaHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/RegionMetropolitanaHibernateDAO.java @@ -25,7 +25,7 @@ public class RegionMetropolitanaHibernateDAO extends GenericHibernateDAO obtenerTodos() { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); return c.setResultTransformer(Criteria.DISTINCT_ROOT_ENTITY).list(); } diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/ReservacionCategoriaHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/ReservacionCategoriaHibernateDAO.java index 74ad8a01f..d86ef123d 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/ReservacionCategoriaHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/ReservacionCategoriaHibernateDAO.java @@ -31,7 +31,7 @@ public class ReservacionCategoriaHibernateDAO @Override public List obtenerTodos() { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); return c.list(); } diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/ReservacionClaseHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/ReservacionClaseHibernateDAO.java index 9ab42bb61..f20ff8384 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/ReservacionClaseHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/ReservacionClaseHibernateDAO.java @@ -31,7 +31,7 @@ public class ReservacionClaseHibernateDAO @Override public List obtenerTodos() { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); return c.list(); } diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/ReservacionCtrlHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/ReservacionCtrlHibernateDAO.java index ced580499..5e28e493a 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/ReservacionCtrlHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/ReservacionCtrlHibernateDAO.java @@ -36,7 +36,7 @@ public class ReservacionCtrlHibernateDAO @Override public List obtenerTodos() { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); return c.list(); } @@ -44,7 +44,7 @@ public class ReservacionCtrlHibernateDAO @Override public List buscar(ReservacionCtrl reservacionCtrl) { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); c.add(Restrictions.eq("descConfig", reservacionCtrl.getDescConfig())); return c.list(); diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/ReservacionMarcaHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/ReservacionMarcaHibernateDAO.java index 426c0a889..d8a8c7e90 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/ReservacionMarcaHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/ReservacionMarcaHibernateDAO.java @@ -30,7 +30,7 @@ public class ReservacionMarcaHibernateDAO extends GenericHibernateDAO obtenerTodos() { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); return c.list(); } diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/ReservacionMercadoHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/ReservacionMercadoHibernateDAO.java index 0b552198b..4278d41dd 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/ReservacionMercadoHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/ReservacionMercadoHibernateDAO.java @@ -31,7 +31,7 @@ public class ReservacionMercadoHibernateDAO @Override public List obtenerTodos() { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); return c.list(); } diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/RestriccionPagoHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/RestriccionPagoHibernateDAO.java index 2ab1394a7..c10bab9ee 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/RestriccionPagoHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/RestriccionPagoHibernateDAO.java @@ -31,7 +31,7 @@ public class RestriccionPagoHibernateDAO extends GenericHibernateDAO obtenerTodos() { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); c.addOrder(Order.asc("descrestriccion")); return c.list(); diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/RhPagoConductorHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/RhPagoConductorHibernateDAO.java index 22d7f148b..742fca163 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/RhPagoConductorHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/RhPagoConductorHibernateDAO.java @@ -31,7 +31,7 @@ public class RhPagoConductorHibernateDAO extends GenericHibernateDAO obtenerTodos() { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); c.addOrder(Order.asc("descrestriccion")); return c.list(); diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/RolOperativoHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/RolOperativoHibernateDAO.java index 460824217..a1b06f621 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/RolOperativoHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/RolOperativoHibernateDAO.java @@ -34,14 +34,14 @@ public class RolOperativoHibernateDAO extends GenericHibernateDAO obtenerTodos() { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); return c.list(); } public List pesquisar(DiagramaAutobus diagrama, String rol) { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); if (diagrama != null) { c.add(Restrictions.eq("diagramaAutobus", diagrama)); @@ -54,7 +54,7 @@ public class RolOperativoHibernateDAO extends GenericHibernateDAO buscar(String descroloperativo) { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); c.add(Restrictions.eq("descroloperativo", descroloperativo)); return c.list(); @@ -64,7 +64,7 @@ public class RolOperativoHibernateDAO extends GenericHibernateDAO buscarListaPorIds(List roloperativoIds) { Criteria c = this.makeCriteria(); c.add(Restrictions.in("roloperativoId", roloperativoIds)); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); return c.list(); } diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/RutaCombinacionHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/RutaCombinacionHibernateDAO.java index cf9f146ab..3ce2d2d09 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/RutaCombinacionHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/RutaCombinacionHibernateDAO.java @@ -67,9 +67,9 @@ public class RutaCombinacionHibernateDAO extends GenericHibernateDAO list = c.list(); @@ -123,7 +123,7 @@ public class RutaCombinacionHibernateDAO extends GenericHibernateDAO 0) { return (RutaCombinacion) c.list().get(0); @@ -140,7 +140,7 @@ public class RutaCombinacionHibernateDAO extends GenericHibernateDAO 0) { return (RutaCombinacion) c.list().get(0); @@ -153,7 +153,7 @@ public class RutaCombinacionHibernateDAO extends GenericHibernateDAO obtenerPorRuta(Ruta ruta) { Criteria c = this.makeCriteria(); c.add(Restrictions.eq("ruta", ruta)); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); return c.list(); } @@ -161,7 +161,7 @@ public class RutaCombinacionHibernateDAO extends GenericHibernateDAO 0l; @@ -834,12 +834,12 @@ public class RutaCombinacionHibernateDAO extends GenericHibernateDAO 0l; diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/RutaEmbarqueDesembarqueHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/RutaEmbarqueDesembarqueHibernateDAO.java index d8c833e53..c2f2acf47 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/RutaEmbarqueDesembarqueHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/RutaEmbarqueDesembarqueHibernateDAO.java @@ -25,7 +25,7 @@ public class RutaEmbarqueDesembarqueHibernateDAO extends GenericHibernateDAO obtenerPorRuta(Ruta ruta) { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); c.add(Restrictions.eq("ruta", ruta)); return c.list(); } diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/RutaEmpresaHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/RutaEmpresaHibernateDAO.java index 7ce85b732..d08f659c7 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/RutaEmpresaHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/RutaEmpresaHibernateDAO.java @@ -44,7 +44,7 @@ public class RutaEmpresaHibernateDAO extends GenericHibernateDAO obtenerPorRuta(Ruta ruta) { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); c.add(Restrictions.eq("ruta", ruta)); return c.list(); diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/RutaHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/RutaHibernateDAO.java index 88b230d5a..e6d04ab0c 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/RutaHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/RutaHibernateDAO.java @@ -51,7 +51,7 @@ public class RutaHibernateDAO extends GenericHibernateDAO impleme @Override public List obtenerTodos() { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); c.addOrder(Order.asc("descruta")); return c.list(); @@ -59,7 +59,7 @@ public class RutaHibernateDAO extends GenericHibernateDAO impleme public List buscarPorTramo(Tramo tramo) { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); Criteria cTipoPuntoVenta = c.createCriteria("rutaCombinacionList"); cTipoPuntoVenta.add(Restrictions.eq("tramo", tramo)); @@ -71,11 +71,11 @@ public class RutaHibernateDAO extends GenericHibernateDAO impleme public List buscarPorRutaPorEmpresas(List lsEmpresas) { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); c.add(Restrictions.eq("indRutaCancelada", false)); Criteria cEmpresa = c.createCriteria("lsRutaEmpresa"); cEmpresa.add(Restrictions.in("empresa", lsEmpresas)); - cEmpresa.add(Restrictions.eq("activo", Boolean.TRUE)); + cEmpresa.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); c.addOrder(Order.asc("descruta")); @@ -88,7 +88,7 @@ public class RutaHibernateDAO extends GenericHibernateDAO impleme public List buscarPorClaseServicio(ClaseServicio claseServicio) { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); c.add(Restrictions.eq("claseServicio", claseServicio)); @@ -117,7 +117,7 @@ public class RutaHibernateDAO extends GenericHibernateDAO impleme public List buscar(String nomeRuta, ClaseServicio claseServicio, Boolean nomeObrigatorio) { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); // c.add(Restrictions.eq("descruta", nomeRuta)); c.add(Restrictions.eq("claseServicio", claseServicio)); c.add(Restrictions.eq("indNombreObligatorio", nomeObrigatorio)); @@ -127,11 +127,11 @@ public class RutaHibernateDAO extends GenericHibernateDAO impleme public List obtenerPorEmpresa(Empresa empresa) { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); c.add(Restrictions.ne("rutaId", -1)); c.add(Restrictions.not(Restrictions.eq("indRutaCancelada", Boolean.TRUE))); if (empresa.getEmpresaId() != -1) { - c.createCriteria("lsRutaEmpresa").add(Restrictions.eq("empresa", empresa)).add(Restrictions.eq("activo", Boolean.TRUE)); + c.createCriteria("lsRutaEmpresa").add(Restrictions.eq("empresa", empresa)).add(Restrictions.eq(ACTIVO, Boolean.TRUE)); } c.addOrder(Order.asc("descruta")); @@ -141,7 +141,7 @@ public class RutaHibernateDAO extends GenericHibernateDAO impleme @Override public Parada buscarOrigen(Ruta ruta) { Criteria c = this.getSession().createCriteria(RutaSecuencia.class); - c.add(Restrictions.eq("activo", true)); + c.add(Restrictions.eq(ACTIVO, true)); c.add(Restrictions.eq("ruta", ruta)); c.addOrder(Order.asc("numsecuencia")); c.createAlias("tramo", "tramo") @@ -155,7 +155,7 @@ public class RutaHibernateDAO extends GenericHibernateDAO impleme @Override public Parada buscarDestino(Ruta ruta) { Criteria c = this.getSession().createCriteria(RutaSecuencia.class); - c.add(Restrictions.eq("activo", true)); + c.add(Restrictions.eq(ACTIVO, true)); c.add(Restrictions.eq("ruta", ruta)); c.addOrder(Order.desc("numsecuencia")); c.createAlias("tramo", "tramo") @@ -170,7 +170,7 @@ public class RutaHibernateDAO extends GenericHibernateDAO impleme for (Integer id : idRuta) { c.add(Restrictions.ne("rutaId", id)); } - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); c.addOrder(Order.asc("descruta")); return c.list(); @@ -179,7 +179,7 @@ public class RutaHibernateDAO extends GenericHibernateDAO impleme public List buscarTodosEstos(Integer[] idRutas) { Criteria c = this.makeCriteria(); c.add(Restrictions.in("rutaId", idRutas)); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); c.addOrder(Order.asc("descruta")); return c.list(); @@ -187,7 +187,7 @@ public class RutaHibernateDAO extends GenericHibernateDAO impleme public List buscarNumRuta(String numRuta) { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", true)); + c.add(Restrictions.eq(ACTIVO, true)); c.add(Restrictions.eq("numRuta", numRuta)); return c.list(); @@ -303,7 +303,7 @@ public class RutaHibernateDAO extends GenericHibernateDAO impleme @Override public List buscarRutasPorEmpresaOrgaoConcedente(Empresa empresa, OrgaoConcedente orgao) { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); c.add(Restrictions.ne("rutaId", -1)); if (empresa != null && empresa.getEmpresaId() != -1) { @@ -323,7 +323,7 @@ public class RutaHibernateDAO extends GenericHibernateDAO impleme @Override public List buscarRutasPorEmpresaOrgaoConcedenteParadaIds(Empresa empresa, OrgaoConcedente orgao, Integer[] lsParadaIds) { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); c.add(Restrictions.ne("rutaId", -1)); if (empresa != null && empresa.getEmpresaId() != -1) { @@ -334,9 +334,9 @@ public class RutaHibernateDAO extends GenericHibernateDAO impleme c.add(Restrictions.eq("orgaoConcedente", orgao)); } Criteria rutaCombinacionList = c.createCriteria("rutaCombinacionList"); - rutaCombinacionList.add(Restrictions.eq("activo", Boolean.TRUE)); + rutaCombinacionList.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); Criteria tramo = rutaCombinacionList.createCriteria("tramo"); - tramo.add(Restrictions.eq("activo", Boolean.TRUE)); + tramo.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); Criteria parada = tramo.createCriteria("origem"); parada.add(Restrictions.in("paradaId", lsParadaIds)); @@ -440,7 +440,7 @@ public class RutaHibernateDAO extends GenericHibernateDAO impleme @Override public List buscarRutasVendaEmbarcada(List empresasIds, Integer rutaId, String numeroLinha, String descRuta, ClaseServicio classe) { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); c.add(Restrictions.ne("rutaId", -1)); if(empresasIds != null && !empresasIds.isEmpty()) { @@ -476,7 +476,7 @@ public class RutaHibernateDAO extends GenericHibernateDAO impleme @Override public List buscaLikeComboBox(String stringConsulta) { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); final SimpleExpression validaNumRuta = Restrictions.like("numRuta", stringConsulta, MatchMode.START); final SimpleExpression validaDescruta = Restrictions.like("descruta", stringConsulta, MatchMode.ANYWHERE); @@ -503,17 +503,17 @@ public class RutaHibernateDAO extends GenericHibernateDAO impleme @Override public List buscarPorOrgaoEcasetaPeaje(OrgaoConcedente orgao, Integer[] listCasetaPeaje,Empresa empresa){ Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); c.add(Restrictions.eq("indRutaCancelada", Boolean.FALSE)); Criteria criteriaRutaSecuencia = c.createCriteria("rutaSecuenciaList","secuencia"); criteriaRutaSecuencia.add(Restrictions.eq("secuencia.activo", Boolean.TRUE)); Criteria criteriaRutaCaseta = criteriaRutaSecuencia.createCriteria("lsRutaCase"); - criteriaRutaCaseta.add(Restrictions.eq("activo", Boolean.TRUE)); + criteriaRutaCaseta.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); Criteria criteriaCasetaPeaje=criteriaRutaCaseta.createCriteria("casetaPeaje"); criteriaCasetaPeaje.add(Restrictions.in("casetaPeajeId", listCasetaPeaje)); if(orgao!=null) { Criteria crietriaOrgaoConcendente = c.createCriteria("orgaoConcedente"); - crietriaOrgaoConcendente.add(Restrictions.eq("activo", Boolean.TRUE)); + crietriaOrgaoConcendente.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); crietriaOrgaoConcendente.add(Restrictions.eq("orgaoConcedenteId", orgao.getOrgaoConcedenteId())); } if (empresa != null && empresa.getEmpresaId() != -1) { diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/RutaSecuenciaHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/RutaSecuenciaHibernateDAO.java index ab98efcf6..003f62c4f 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/RutaSecuenciaHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/RutaSecuenciaHibernateDAO.java @@ -39,7 +39,7 @@ public class RutaSecuenciaHibernateDAO extends GenericHibernateDAO buscarSecuenciaOrdenado(Ruta ruta) { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); c.add(Restrictions.eq("ruta", ruta)); c.setFetchMode("lsRutaCase", FetchMode.JOIN); @@ -59,7 +59,7 @@ public class RutaSecuenciaHibernateDAO extends GenericHibernateDAO buscarPorSecretaria(Secretaria secretaria) { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); c.add(Restrictions.eq("secretaria", secretaria)); return c.list(); diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/SecretariaHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/SecretariaHibernateDAO.java index f9dec6e53..129533115 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/SecretariaHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/SecretariaHibernateDAO.java @@ -31,14 +31,14 @@ public class SecretariaHibernateDAO extends GenericHibernateDAO obtenerTodos() { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); return c.list(); } public List buscar(String descsecretaria, String cvesecretaria) { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); c.add(Restrictions.eq("descsecretaria", descsecretaria)); c.add(Restrictions.eq("cvesecretaria", cvesecretaria)); @@ -49,7 +49,7 @@ public class SecretariaHibernateDAO extends GenericHibernateDAO buscar(String descsecretaria) { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); c.add(Restrictions.eq("descsecretaria", descsecretaria)); return c.list(); @@ -59,7 +59,7 @@ public class SecretariaHibernateDAO extends GenericHibernateDAO buscaLike(String descsecretaria) { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); c.add(Restrictions.like("descsecretaria", descsecretaria, MatchMode.START)); return c.list(); diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/SegVKMHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/SegVKMHibernateDAO.java index 6ed8c6ce1..bc7c2bfc5 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/SegVKMHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/SegVKMHibernateDAO.java @@ -36,14 +36,14 @@ public class SegVKMHibernateDAO extends GenericHibernateDAO @Override public List obtenerTodos() { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); return c.list(); } public List buscar(String serie) { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); c.add(Restrictions.eq("serie", serie)); diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/SeguradoraEmpresaHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/SeguradoraEmpresaHibernateDAO.java index 21480d18d..bd61e96d6 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/SeguradoraEmpresaHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/SeguradoraEmpresaHibernateDAO.java @@ -23,14 +23,14 @@ public class SeguradoraEmpresaHibernateDAO extends GenericHibernateDAO obtenerTodos() { Criteria c = makeCriteria(); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); return c.list(); } public boolean existe(Empresa empresa, String serie){ Criteria c = makeCriteria(); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); c.add(Restrictions.eq("empresa", empresa)); c.add(Restrictions.eq("serie", serie)); return !c.list().isEmpty(); diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/SeguroKmHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/SeguroKmHibernateDAO.java index 256231a68..dad30a9b0 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/SeguroKmHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/SeguroKmHibernateDAO.java @@ -25,7 +25,7 @@ public class SeguroKmHibernateDAO extends GenericHibernateDAO public boolean existe(Integer orgaoConcedenteId) { Criteria c = makeCriteria(); c.add(Restrictions.eq("orgaoconcedente.orgaoConcedenteId", orgaoConcedenteId)); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); c.setProjection(Projections.rowCount()); @@ -35,7 +35,7 @@ public class SeguroKmHibernateDAO extends GenericHibernateDAO public List buscarPorOrgao(OrgaoConcedente orgao) { Criteria c = makeCriteria(); c.add(Restrictions.eq("orgaoconcedente", orgao)); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); return c.list(); } diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/SeguroTarifaHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/SeguroTarifaHibernateDAO.java index a70c505db..90e3e99f7 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/SeguroTarifaHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/SeguroTarifaHibernateDAO.java @@ -25,7 +25,7 @@ public class SeguroTarifaHibernateDAO extends GenericHibernateDAO buscarPorOrgao(OrgaoConcedente orgao) { Criteria c = makeCriteria(); c.add(Restrictions.eq("orgaoconcedente", orgao)); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); return c.list(); } diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/SistemaHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/SistemaHibernateDAO.java index c454f506e..e509c0b66 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/SistemaHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/SistemaHibernateDAO.java @@ -31,7 +31,7 @@ public class SistemaHibernateDAO extends GenericHibernateDAO @Override public List obtenerTodos() { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); c.addOrder(Order.asc("nombsistema")); return c.list(); diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/TarifaCategoriaHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/TarifaCategoriaHibernateDAO.java index 4e737d0e8..6443866ff 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/TarifaCategoriaHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/TarifaCategoriaHibernateDAO.java @@ -32,7 +32,7 @@ public class TarifaCategoriaHibernateDAO @Override public List obtenerTodos() { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); return c.list(); } diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/TarifaConvenioTransportHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/TarifaConvenioTransportHibernateDAO.java index ddd9a0739..f3ffd9d10 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/TarifaConvenioTransportHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/TarifaConvenioTransportHibernateDAO.java @@ -24,7 +24,7 @@ public class TarifaConvenioTransportHibernateDAO extends GenericHibernateDAO obtenerTodos() { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); return c.list(); } diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/TarifaEmbarcadaHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/TarifaEmbarcadaHibernateDAO.java index 6d7954574..90f3d3c09 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/TarifaEmbarcadaHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/TarifaEmbarcadaHibernateDAO.java @@ -47,7 +47,7 @@ public class TarifaEmbarcadaHibernateDAO extends GenericHibernateDAO obtenerTodos() { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); return c.list(); } @@ -117,14 +117,14 @@ public class TarifaEmbarcadaHibernateDAO extends GenericHibernateDAO obtenerTodos() { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); return c.list(); } diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/TarifaGrupoContratoHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/TarifaGrupoContratoHibernateDAO.java index 25f2dd3a4..139cb550d 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/TarifaGrupoContratoHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/TarifaGrupoContratoHibernateDAO.java @@ -24,7 +24,7 @@ public class TarifaGrupoContratoHibernateDAO extends GenericHibernateDAO obtenerTodos() { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); return c.list(); } diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/TarifaHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/TarifaHibernateDAO.java index 837f02b36..32f02733c 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/TarifaHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/TarifaHibernateDAO.java @@ -62,7 +62,7 @@ public class TarifaHibernateDAO extends GenericHibernateDAO imp @Override public List obtenerTodos() { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); return c.list(); } @@ -101,14 +101,14 @@ public class TarifaHibernateDAO extends GenericHibernateDAO imp if (categoria != null) { cCategoria = c.createCriteria("lsTarifaCategoria"); cCategoria.add(Restrictions.eq("categoria", categoria)); - cCategoria.add(Restrictions.eq("activo", Boolean.TRUE)); + cCategoria.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); } Criteria cTipoPuntoVenta = null; if (tipoPuntoVenta != null) { cTipoPuntoVenta = c.createCriteria("lsTarifaTipoptovta"); cTipoPuntoVenta.add(Restrictions.eq("tipoPuntoVenta", tipoPuntoVenta)); - cTipoPuntoVenta.add(Restrictions.eq("activo", Boolean.TRUE)); + cTipoPuntoVenta.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); } if (marca != null) { @@ -145,14 +145,14 @@ public class TarifaHibernateDAO extends GenericHibernateDAO imp c.add(Restrictions.eq("marca", marca)); Criteria cTramo = c.createCriteria("tramo"); - cTramo.add(Restrictions.eq("activo", true)); + cTramo.add(Restrictions.eq(ACTIVO, true)); c.add(Restrictions.eq("tramo", tramo)); c.add(Restrictions.eq("claseServicio", claseServicio)); c.add(Restrictions.eq("vigenciaTarifa", vigenciaTarifa)); c.add(Restrictions.eq("moneda", moneda)); c.add(Restrictions.eq("ruta", ruta)); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); return (Tarifa) c.uniqueResult(); } @@ -172,7 +172,7 @@ public class TarifaHibernateDAO extends GenericHibernateDAO imp public List buscarTarifasAtivasPorVigencia(VigenciaTarifa vigenciaTarifa) { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); c.add(Restrictions.eq("vigenciaTarifa", vigenciaTarifa)); return c.list(); @@ -181,7 +181,7 @@ public class TarifaHibernateDAO extends GenericHibernateDAO imp public boolean buscarTarifaExisteTramo(Tramo tramo) { Criteria c = this.makeCriteria(); c.add(Restrictions.eq("tramo", tramo)); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); c.setProjection(Projections.rowCount()); return (HibernateFix.count(c.list()) > 0); @@ -273,7 +273,7 @@ public class TarifaHibernateDAO extends GenericHibernateDAO imp @Override public boolean existeTarifas(VigenciaTarifa vigenciaTarifa) { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); c.add(Restrictions.eq("vigenciaTarifa", vigenciaTarifa)); c.setProjection(Projections.rowCount()); return (HibernateFix.count(c.list()) > 0); diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/TarifaHistHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/TarifaHistHibernateDAO.java index 2e3602395..79ff0f81c 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/TarifaHistHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/TarifaHistHibernateDAO.java @@ -30,7 +30,7 @@ public class TarifaHistHibernateDAO extends GenericHibernateDAO obtenerTodos() { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); return c.list(); } diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/TarifaKmHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/TarifaKmHibernateDAO.java index ecb90ab46..30ee055b1 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/TarifaKmHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/TarifaKmHibernateDAO.java @@ -29,7 +29,7 @@ implements TarifaKmDAO { public List buscarPorOrgaoAndClasse(OrgaoConcedente orgaoconcedenteId, ClaseServicio claseId) { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); c.add(Restrictions.eq("orgaoconcedenteId", orgaoconcedenteId)); if( claseId.getClaseservicioId() != -1){ c.add(Restrictions.eq("claseServicio", claseId)); diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/TarifaMinimaHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/TarifaMinimaHibernateDAO.java index 3f05da09f..b19f427ab 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/TarifaMinimaHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/TarifaMinimaHibernateDAO.java @@ -45,7 +45,7 @@ public class TarifaMinimaHibernateDAO extends GenericHibernateDAO obtenerTodos() { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); return c.list(); } @@ -53,7 +53,7 @@ public class TarifaMinimaHibernateDAO extends GenericHibernateDAO pesquisar(Marca marca, Parada origem, Parada destino, ClaseServicio claseServicio, Moneda moneda,VigenciaTarifa vigenciaTarifa) { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); if (marca != null) { c.add(Restrictions.eq("marca", marca)); @@ -81,7 +81,7 @@ public class TarifaMinimaHibernateDAO extends GenericHibernateDAO pesquisarPlaza(Marca marca, Parada origem, Parada destino, ClaseServicio claseServicio, Plaza plaza) { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); if (marca != null) { c.add(Restrictions.eq("marca", marca)); @@ -109,7 +109,7 @@ public class TarifaMinimaHibernateDAO extends GenericHibernateDAO buscarPorPlaza(Plaza plaza) { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); c.add(Restrictions.eq("plaza", plaza)); return c.list(); @@ -119,7 +119,7 @@ public class TarifaMinimaHibernateDAO extends GenericHibernateDAO pesquisar(TarifaMinima tarifaMinima) { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); // c.add(Restrictions.eq("importetarifa", valor)); c.add(Restrictions.eq("moneda", tarifaMinima.getMoneda())); @@ -178,7 +178,7 @@ public class TarifaMinimaHibernateDAO extends GenericHibernateDAO buscarPorMarcaMoneda(Marca marca, Moneda moneda) { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); c.add(Restrictions.eq("marca", marca)); c.add(Restrictions.eq("moneda", moneda)); @@ -202,7 +202,7 @@ public class TarifaMinimaHibernateDAO extends GenericHibernateDAO buscarPorClaseServicioMoneda( ClaseServicio claseServicio, Moneda moneda) { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); c.add(Restrictions.eq("claseServicio", claseServicio)); c.add(Restrictions.eq("moneda", moneda)); @@ -213,7 +213,7 @@ public class TarifaMinimaHibernateDAO extends GenericHibernateDAO buscarPorPlazaMoneda(Plaza plaza, Moneda moneda) { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); c.add(Restrictions.eq("plaza", plaza)); c.add(Restrictions.eq("moneda", moneda)); diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/TarifaTipoptovtaHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/TarifaTipoptovtaHibernateDAO.java index f31e20391..1bb45bb13 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/TarifaTipoptovtaHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/TarifaTipoptovtaHibernateDAO.java @@ -31,7 +31,7 @@ public class TarifaTipoptovtaHibernateDAO @Override public List obtenerTodos() { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); return c.list(); } diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/TarjetaCreditoHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/TarjetaCreditoHibernateDAO.java index 517b54f22..753b14123 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/TarjetaCreditoHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/TarjetaCreditoHibernateDAO.java @@ -25,7 +25,7 @@ public class TarjetaCreditoHibernateDAO extends GenericHibernateDAO obtenerTodos() { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); c.addOrder(Order.asc("descTarjetaCredito")); return c.list(); diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/TarjetaFidelidadHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/TarjetaFidelidadHibernateDAO.java index 465e0a43d..e4c794551 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/TarjetaFidelidadHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/TarjetaFidelidadHibernateDAO.java @@ -39,7 +39,7 @@ public class TarjetaFidelidadHibernateDAO extends GenericHibernateDAO obtenerTodos() { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); return c.list(); @@ -47,7 +47,7 @@ public class TarjetaFidelidadHibernateDAO extends GenericHibernateDAO obtenerCantDesc() { /*Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); ProjectionList projList = Projections.projectionList(); projList.add(Projections.groupProperty("descGeneracion")); projList.add(Projections.rowCount()); diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/TarjetaRecaudacionHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/TarjetaRecaudacionHibernateDAO.java index 70da4125c..5f75f4743 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/TarjetaRecaudacionHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/TarjetaRecaudacionHibernateDAO.java @@ -32,7 +32,7 @@ public class TarjetaRecaudacionHibernateDAO @Override public List obtenerTodos() { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); return c.list(); } diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/TarjetaViajeHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/TarjetaViajeHibernateDAO.java index 3455c35f6..7e8afeff2 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/TarjetaViajeHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/TarjetaViajeHibernateDAO.java @@ -64,7 +64,7 @@ public class TarjetaViajeHibernateDAO extends GenericHibernateDAO buscarTarjetaPorFiltros(TarjetaViaje tarjeta) { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", true)); + c.add(Restrictions.eq(ACTIVO, true)); c.add(Restrictions.or(Restrictions.eq("autobus", tarjeta.getAutobus()), Restrictions.eq("conductor", tarjeta.getConductor()))); c.add(Restrictions.eq("origen", tarjeta.getOrigen())); return c.list(); @@ -73,7 +73,7 @@ public class TarjetaViajeHibernateDAO extends GenericHibernateDAO buscarTarjetasParaEnvioNomina(Date fecIni, Date fecFin) { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", true)); + c.add(Restrictions.eq(ACTIVO, true)); c.add(Restrictions.isNull("fecenvionomina")); GregorianCalendar gAux = new GregorianCalendar(); diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/TaxaEmbarqueKmHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/TaxaEmbarqueKmHibernateDAO.java index dd603f4f3..5008324d8 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/TaxaEmbarqueKmHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/TaxaEmbarqueKmHibernateDAO.java @@ -30,7 +30,7 @@ public class TaxaEmbarqueKmHibernateDAO extends GenericHibernateDAO buscarPorOrgao(OrgaoConcedente orgaoconcedenteId) { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); c.add(Restrictions.eq("orgaoconcedenteId", orgaoconcedenteId)); return c.list(); diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/TaxaEmbarqueParadaHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/TaxaEmbarqueParadaHibernateDAO.java index 10ed8b613..3873c4963 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/TaxaEmbarqueParadaHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/TaxaEmbarqueParadaHibernateDAO.java @@ -41,7 +41,7 @@ public class TaxaEmbarqueParadaHibernateDAO extends GenericHibernateDAO buscarPorLocalidade(Parada parada) { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); c.add(Restrictions.eq("paradaId", parada)); return c.list(); diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/TipoCambioCiudadHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/TipoCambioCiudadHibernateDAO.java index f639f60fa..78baf5f25 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/TipoCambioCiudadHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/TipoCambioCiudadHibernateDAO.java @@ -30,7 +30,7 @@ public class TipoCambioCiudadHibernateDAO extends GenericHibernateDAO obtenerTodos() { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); return c.list(); } diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/TipoCambioCtrlHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/TipoCambioCtrlHibernateDAO.java index 5ab521926..f22695d56 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/TipoCambioCtrlHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/TipoCambioCtrlHibernateDAO.java @@ -30,7 +30,7 @@ public class TipoCambioCtrlHibernateDAO extends GenericHibernateDAO obtenerTodos() { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); return c.list(); } diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/TipoConvenioHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/TipoConvenioHibernateDAO.java index a5cc27361..69c246d34 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/TipoConvenioHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/TipoConvenioHibernateDAO.java @@ -31,7 +31,7 @@ public class TipoConvenioHibernateDAO extends GenericHibernateDAO obtenerTodos() { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); return c.list(); } diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/TipoCorteHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/TipoCorteHibernateDAO.java index 947525aff..b778d967d 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/TipoCorteHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/TipoCorteHibernateDAO.java @@ -30,14 +30,14 @@ public class TipoCorteHibernateDAO extends GenericHibernateDAO obtenerTodos() { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); return c.list(); } public List buscar(String desctipo) { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); c.add(Restrictions.eq("desctipo", desctipo)); diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/TipoCortesiaDescuentoHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/TipoCortesiaDescuentoHibernateDAO.java index c71a25a2e..588f81ecc 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/TipoCortesiaDescuentoHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/TipoCortesiaDescuentoHibernateDAO.java @@ -33,7 +33,7 @@ public class TipoCortesiaDescuentoHibernateDAO @Override public List obtenerTodos() { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); return c.list(); } @@ -41,7 +41,7 @@ public class TipoCortesiaDescuentoHibernateDAO public List pesquisar(TipoCortesia tipoCortesia) { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); if (tipoCortesia != null) { c.add(Restrictions.eq("tipoCortesia", tipoCortesia)); @@ -52,7 +52,7 @@ public class TipoCortesiaDescuentoHibernateDAO public List Onchangue(TipoCortesia tp) { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); if (tp != null) { @@ -64,7 +64,7 @@ public class TipoCortesiaDescuentoHibernateDAO public List buscar(BigDecimal porcentaje, TipoCortesia tipoCortesia) { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); c.add(Restrictions.eq("porcdescuento", porcentaje)); c.add(Restrictions.eq("tipoCortesia", tipoCortesia)); @@ -75,7 +75,7 @@ public class TipoCortesiaDescuentoHibernateDAO public List obtenerTipoCortesia(int i) { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); c.add(Restrictions.eq("tipoCortesia.tipocortesiaId", new Integer(i).shortValue())); return c.list(); diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/TipoCortesiaHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/TipoCortesiaHibernateDAO.java index 9b42023b1..7f91fa546 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/TipoCortesiaHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/TipoCortesiaHibernateDAO.java @@ -30,14 +30,14 @@ public class TipoCortesiaHibernateDAO extends GenericHibernateDAO obtenerTodos() { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); return c.list(); } public List buscar(String descTipo) { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); c.add(Restrictions.eq("desctipo", descTipo)); return c.list(); @@ -45,7 +45,7 @@ public class TipoCortesiaHibernateDAO extends GenericHibernateDAO obtenerGrupoCortesia(int i) { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); c.add(Restrictions.eq("grupoCortesia.grupocortesiaId", new Integer(i).shortValue())); return c.list(); diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/TipoDomicilioHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/TipoDomicilioHibernateDAO.java index c73b57929..cb4403345 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/TipoDomicilioHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/TipoDomicilioHibernateDAO.java @@ -30,14 +30,14 @@ public class TipoDomicilioHibernateDAO extends GenericHibernateDAO obtenerTodos() { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); return c.list(); } public List buscar(String desctipo, String cvetipodomicilio) { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); c.add(Restrictions.eq("desctipo", desctipo)); c.add(Restrictions.eq("cvetipodomicilio", cvetipodomicilio)); @@ -47,7 +47,7 @@ public class TipoDomicilioHibernateDAO extends GenericHibernateDAO buscarClave(String cvetipodomicilio) { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); c.add(Restrictions.eq("cvetipodomicilio", cvetipodomicilio)); diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/TipoEmpleadoHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/TipoEmpleadoHibernateDAO.java index 955acce24..0f309a235 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/TipoEmpleadoHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/TipoEmpleadoHibernateDAO.java @@ -35,7 +35,7 @@ implements TipoEmpleadoDAO{ @Override public List obtenerTodos() { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); return c.list(); } diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/TipoEventoExtraFormaPagoHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/TipoEventoExtraFormaPagoHibernateDAO.java index dab6a00ff..09ae38bfd 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/TipoEventoExtraFormaPagoHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/TipoEventoExtraFormaPagoHibernateDAO.java @@ -34,7 +34,7 @@ public class TipoEventoExtraFormaPagoHibernateDAO extends GenericHibernateDAO buscarPorTipoEventoExtra(TipoEventoExtra tipoeventoextra) { Criteria c = getSession().createCriteria(getPersistentClass()); c.add(Restrictions.eq("tipoeventoextra", tipoeventoextra)); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); return c.list(); } diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/TipoEventoExtraHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/TipoEventoExtraHibernateDAO.java index 0b2ae0eec..c94ec5fc5 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/TipoEventoExtraHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/TipoEventoExtraHibernateDAO.java @@ -27,7 +27,7 @@ public class TipoEventoExtraHibernateDAO extends @Override public List obtenerTodos() { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); return c.list(); } @@ -35,7 +35,7 @@ public class TipoEventoExtraHibernateDAO extends @Override public List buscar(String nombIngreso) { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); c.add(Restrictions.eq("descTipoEvento", nombIngreso)); return c.list(); @@ -44,7 +44,7 @@ public class TipoEventoExtraHibernateDAO extends @Override public List buscarLike(String nombIngreso) { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); c.add(Restrictions.like("descTipoEvento", nombIngreso, MatchMode.ANYWHERE)); return c.list(); diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/TipoInformativoComissaoHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/TipoInformativoComissaoHibernateDAO.java index 1fd92f6c2..84d0955db 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/TipoInformativoComissaoHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/TipoInformativoComissaoHibernateDAO.java @@ -25,7 +25,7 @@ public class TipoInformativoComissaoHibernateDAO extends GenericHibernateDAO obtenerTodos() { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); return c.list(); } @@ -34,7 +34,7 @@ public class TipoInformativoComissaoHibernateDAO extends GenericHibernateDAO obtenerTodos() { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); return (List)c.list(); } @@ -33,7 +33,7 @@ public class TipoMovimentacionHibernateDAO extends GenericHibernateDAO obtenerTiposMovimetacionPuntoVenta() { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); c.add(Restrictions.in("tipomovimentacionId", new Integer[]{TipoMovimentacion.TIPO_ENVIO, TipoMovimentacion.TIPO_TRANSFERENCIA, TipoMovimentacion.TIPO_VOLVER})); return c.list(); diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/TipoMovimientoHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/TipoMovimientoHibernateDAO.java index 29851bd86..147f1c706 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/TipoMovimientoHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/TipoMovimientoHibernateDAO.java @@ -30,14 +30,14 @@ public class TipoMovimientoHibernateDAO extends GenericHibernateDAO obtenerTodos() { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); return c.list(); } public List buscar(String descmovimiento) { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); c.add(Restrictions.eq("descmovimiento", descmovimiento)); diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/TipoOcupacionHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/TipoOcupacionHibernateDAO.java index 3b6d18ac5..ce6431a4d 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/TipoOcupacionHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/TipoOcupacionHibernateDAO.java @@ -32,14 +32,14 @@ public class TipoOcupacionHibernateDAO extends GenericHibernateDAO obtenerTodos() { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); return c.list(); } public List buscar(String desctipo, String cvetipoocupacion) { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); if (desctipo != null) { c.add(Restrictions.eq("desctipo", desctipo)); @@ -54,7 +54,7 @@ public class TipoOcupacionHibernateDAO extends GenericHibernateDAO buscarClave(String cvetipoocupacion) { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); c.add(Restrictions.eq("cvetipoocupacion", cvetipoocupacion)); diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/TipoParadaHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/TipoParadaHibernateDAO.java index 4204f6f44..2a0883c7c 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/TipoParadaHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/TipoParadaHibernateDAO.java @@ -31,7 +31,7 @@ public class TipoParadaHibernateDAO extends GenericHibernateDAO obtenerTodos() { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); c.addOrder(Order.asc("desctipo")); return c.list(); @@ -39,7 +39,7 @@ public class TipoParadaHibernateDAO extends GenericHibernateDAO buscar(String desctipo) { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); c.add(Restrictions.eq("desctipo", desctipo)); return c.list(); diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/TipoPuntoVentaHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/TipoPuntoVentaHibernateDAO.java index cd0468577..f07ec7da7 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/TipoPuntoVentaHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/TipoPuntoVentaHibernateDAO.java @@ -32,7 +32,7 @@ public class TipoPuntoVentaHibernateDAO extends GenericHibernateDAO obtenerTodos() { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); c.addOrder(Order.asc("desctipo")); return c.list(); @@ -40,7 +40,7 @@ public class TipoPuntoVentaHibernateDAO extends GenericHibernateDAO buscar(String desctipo) { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); c.add(Restrictions.eq("desctipo", desctipo)); return c.list(); @@ -49,7 +49,7 @@ public class TipoPuntoVentaHibernateDAO extends GenericHibernateDAO obtenerTodosExceto(Short... id) { Criteria c = makeCriteria(); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); c.addOrder(Order.asc("desctipo")); c.add(Restrictions.not(Restrictions.in("tipoptovtaId", id))); diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/TipoServicioHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/TipoServicioHibernateDAO.java index 47241307f..12890a944 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/TipoServicioHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/TipoServicioHibernateDAO.java @@ -34,7 +34,7 @@ public class TipoServicioHibernateDAO extends GenericHibernateDAO obtenerTodos() { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); c.addOrder(Order.asc("descservicio")); return c.list(); @@ -42,7 +42,7 @@ public class TipoServicioHibernateDAO extends GenericHibernateDAO buscar(String descservicio) { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); c.add(Restrictions.eq("descservicio", descservicio)); return c.list(); @@ -52,7 +52,7 @@ public class TipoServicioHibernateDAO extends GenericHibernateDAO buscarListaPorIds(List tiposervicioIds) { Criteria c = this.makeCriteria(); c.add(Restrictions.in("tiposervicioId", tiposervicioIds)); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); return c.list(); } diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/TipoTarifaPacoteHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/TipoTarifaPacoteHibernateDAO.java index 605fd37f4..9deadef5c 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/TipoTarifaPacoteHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/TipoTarifaPacoteHibernateDAO.java @@ -28,7 +28,7 @@ public class TipoTarifaPacoteHibernateDAO extends GenericHibernateDAO obtenerTodos() { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); c.addOrder(Order.asc("desctipotarifa")); return c.list(); diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/TipoVentaHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/TipoVentaHibernateDAO.java index 06fe38964..183c46124 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/TipoVentaHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/TipoVentaHibernateDAO.java @@ -34,7 +34,7 @@ public class TipoVentaHibernateDAO extends GenericHibernateDAO obtenerTodos() { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); c.addOrder(Order.asc("desctipoventa")); return c.list(); @@ -42,7 +42,7 @@ public class TipoVentaHibernateDAO extends GenericHibernateDAO buscar(String desctipoventa) { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); c.add(Restrictions.eq("desctipoventa", desctipoventa)); return c.list(); diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/TramoHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/TramoHibernateDAO.java index a777dacc5..d332bb932 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/TramoHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/TramoHibernateDAO.java @@ -48,7 +48,7 @@ public class TramoHibernateDAO extends GenericHibernateDAO @Override public List obtenerTodos() { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); c.addOrder(Order.asc("desctramo")); return c.list(); @@ -62,7 +62,7 @@ public class TramoHibernateDAO extends GenericHibernateDAO Criteria c = getSession().createCriteria(getPersistentClass()); c.add(Restrictions.eq("origem", origem)); c.add(Restrictions.eq("destino", destino)); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); Tramo t = new Tramo(); if (c.list().size() > 0) { @@ -77,7 +77,7 @@ public class TramoHibernateDAO extends GenericHibernateDAO c.add(Restrictions.eq("origem", origem)); c.add(Restrictions.eq("destino", destino)); c.add(Restrictions.eq("via", via)); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); return (Tramo) c.uniqueResult(); } @@ -86,7 +86,7 @@ public class TramoHibernateDAO extends GenericHibernateDAO Criteria c = getSession().createCriteria(getPersistentClass()); c.add(Restrictions.eq("origem", origem)); c.add(Restrictions.eq("destino", destino)); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); c.addOrder(Order.asc("desctramo")); return c.list(); @@ -96,7 +96,7 @@ public class TramoHibernateDAO extends GenericHibernateDAO Criteria c = getSession().createCriteria(getPersistentClass()); c.add(Restrictions.eq("origem", origem)); c.add(Restrictions.eq("destino", destino)); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); c.addOrder(Order.asc("desctramo")); c.setFetchMode("origem", FetchMode.SELECT); @@ -115,7 +115,7 @@ public class TramoHibernateDAO extends GenericHibernateDAO Criteria c = makeCriteria(); c.add(Restrictions.eq("origem", origem)); c.add(Restrictions.eq("destino", destino)); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); c.addOrder(Order.asc("desctramo")); c.setProjection(Projections.property("via")); @@ -125,7 +125,7 @@ public class TramoHibernateDAO extends GenericHibernateDAO public Tramo busca(Parada origem, Parada destino, Via via) { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); c.add(Restrictions.eq("origem", origem)); c.add(Restrictions.eq("destino", destino)); c.add(Restrictions.eq("via", via)); @@ -140,7 +140,7 @@ public class TramoHibernateDAO extends GenericHibernateDAO c.createCriteria("destino").add(Restrictions.eq("paradaId", Integer.parseInt(destino))); c.createCriteria("via").add(Restrictions.eq("viaId", Integer.parseInt(via))); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); return c.list(); } @@ -151,7 +151,7 @@ public class TramoHibernateDAO extends GenericHibernateDAO c.add(Restrictions.eq("origem", origem)); c.add(Restrictions.eq("destino", destino)); c.add(Restrictions.eq("via", via)); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); c.setFetchMode("origem", FetchMode.SELECT); c.setFetchMode("destino", FetchMode.SELECT); @@ -163,7 +163,7 @@ public class TramoHibernateDAO extends GenericHibernateDAO Criteria c2 = c.createCriteria("tramoServicioList"); c2.add(Restrictions.eq("claseServicio", claseServicio)); - c2.add(Restrictions.eq("activo", Boolean.TRUE)); + c2.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); c.setMaxResults(1); List result = c.list(); @@ -179,7 +179,7 @@ public class TramoHibernateDAO extends GenericHibernateDAO Criteria c = this.makeCriteria(); c.add(Restrictions.eq("via", via)); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); c.setProjection(Projections.rowCount()); @@ -194,7 +194,7 @@ public class TramoHibernateDAO extends GenericHibernateDAO public List buscarListaPorIds(List tramoIds) { Criteria c = this.makeCriteria(); c.add(Restrictions.in("tramoId", tramoIds)); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); return c.list(); } @@ -291,7 +291,7 @@ public class TramoHibernateDAO extends GenericHibernateDAO Criteria c = getSession().createCriteria(getPersistentClass()); c.add(Restrictions.eq("origem", origem)); c.add(Restrictions.eq("destino", destino)); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); return c.list(); diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/TramoKmServicioHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/TramoKmServicioHibernateDAO.java index 8d2ad8483..432f58cff 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/TramoKmServicioHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/TramoKmServicioHibernateDAO.java @@ -34,7 +34,7 @@ public class TramoKmServicioHibernateDAO extends GenericHibernateDAO buscar(TramoKmServicio tramoKmServicio) { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); c.add(Restrictions.eq("tramo", tramoKmServicio.getTramo())); c.add(Restrictions.eq("claseServicio", tramoKmServicio.getClaseServicio())); c.add(Restrictions.eq("empresa", tramoKmServicio.getEmpresa())); diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/TramoServicioHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/TramoServicioHibernateDAO.java index bc7a3de67..ada3492d4 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/TramoServicioHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/TramoServicioHibernateDAO.java @@ -51,7 +51,7 @@ public class TramoServicioHibernateDAO extends GenericHibernateDAO buscarPorTramo(Tramo tramo) { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); c.add(Restrictions.eq("tramo", tramo)); return c.list(); @@ -59,7 +59,7 @@ public class TramoServicioHibernateDAO extends GenericHibernateDAO buscarPorTramo(Tramo tramo, ClaseServicio clase) { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); c.add(Restrictions.eq("tramo", tramo)); c.add(Restrictions.eq("claseServicio", clase)); @@ -70,12 +70,12 @@ public class TramoServicioHibernateDAO extends GenericHibernateDAO obtenerTodos() { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); return c.list(); } public List buscarPorTramo(Tramo tramo) { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); c.add(Restrictions.eq("tramo", tramo)); return c.list(); @@ -53,7 +53,7 @@ public class TramoTiempoHibernateDAO extends GenericHibernateDAO buscarPorTramo(Tramo tramo, ClaseServicio clase) { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); c.add(Restrictions.eq("tramo", tramo)); c.add(Restrictions.eq("claseServicio", clase)); @@ -64,7 +64,7 @@ public class TramoTiempoHibernateDAO extends GenericHibernateDAO buscar(Tramo tramo, ClaseServicio clase, Date horaIni, Date horaFin) { Criteria c = this.makeCriteria(); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); c.add(Restrictions.eq("tramo", tramo)); c.add(Restrictions.eq("claseServicio", clase)); diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/TransportadoraHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/TransportadoraHibernateDAO.java index a09d2e848..df2891b74 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/TransportadoraHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/TransportadoraHibernateDAO.java @@ -24,7 +24,7 @@ public class TransportadoraHibernateDAO extends GenericHibernateDAO obtenerTodos() { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); return c.list(); } @@ -33,7 +33,7 @@ public class TransportadoraHibernateDAO extends GenericHibernateDAO @Override public List obtenerTodos() { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); return c.list(); } public List buscar(String descturno) { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); c.add(Restrictions.eq("descturno", descturno)); diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/UsuarioBancarioHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/UsuarioBancarioHibernateDAO.java index c78fee960..bba36e3c0 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/UsuarioBancarioHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/UsuarioBancarioHibernateDAO.java @@ -30,7 +30,7 @@ public class UsuarioBancarioHibernateDAO extends GenericHibernateDAO obtenerTodos() { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); return c.list(); } diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/UsuarioEmpresaHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/UsuarioEmpresaHibernateDAO.java index 7d5b1b64a..cec36907e 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/UsuarioEmpresaHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/UsuarioEmpresaHibernateDAO.java @@ -29,14 +29,14 @@ public class UsuarioEmpresaHibernateDAO extends GenericHibernateDAO obtenerTodos() { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); return c.list(); } public List obtenerPorUsuario(Usuario usuario) { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); c.add(Restrictions.eq("usuarioLog", usuario)); return c.list(); @@ -44,7 +44,7 @@ public class UsuarioEmpresaHibernateDAO extends GenericHibernateDAO obtenerEmpresa(Usuario usuario) { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); c.add(Restrictions.eq("usuarioLog", usuario)); List usuarioEmpresaList = c.list(); List empresaList = new ArrayList(); diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/UsuarioHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/UsuarioHibernateDAO.java index e89afc67b..730558cba 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/UsuarioHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/UsuarioHibernateDAO.java @@ -50,7 +50,7 @@ public class UsuarioHibernateDAO extends GenericHibernateDAO i @Override public List obtenerTodos() { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); return c.list(); } @@ -58,7 +58,7 @@ public class UsuarioHibernateDAO extends GenericHibernateDAO i @SuppressWarnings("unchecked") public List buscarPeloNome(String nome) { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); c.add(Restrictions.eq("nombusuario", nome)); c.addOrder(Order.asc("nombusuario")); @@ -70,7 +70,7 @@ public class UsuarioHibernateDAO extends GenericHibernateDAO i Criteria c = getSession().createCriteria(getPersistentClass()); c.add(Restrictions.eq("claveUsuario", stUsuario)); c.add(Restrictions.eq("senha", senha)); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); return (Usuario) c.uniqueResult(); } @@ -78,7 +78,7 @@ public class UsuarioHibernateDAO extends GenericHibernateDAO i @SuppressWarnings("unchecked") public List buscarPorEmpleado(Empleado empleado) { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); c.add(Restrictions.eq("empleado", empleado)); @@ -111,7 +111,7 @@ public class UsuarioHibernateDAO extends GenericHibernateDAO i @SuppressWarnings("unchecked") public List buscarPeloNomeLike(String nome) { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); c.add(Restrictions.like("nombusuario", nome, MatchMode.START)); c.addOrder(Order.asc("nombusuario")); diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/UsuarioPerfilHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/UsuarioPerfilHibernateDAO.java index ae85d83cc..41c7c2aac 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/UsuarioPerfilHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/UsuarioPerfilHibernateDAO.java @@ -33,14 +33,14 @@ public class UsuarioPerfilHibernateDAO extends GenericHibernateDAO obtenerTodos() { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); return c.list(); } public List obtenerPorUsuario(Usuario usuario) { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); c.add(Restrictions.eq("usuario", usuario)); return c.list(); diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/UsuarioSesionHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/UsuarioSesionHibernateDAO.java index b0f9d655e..b8d556c04 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/UsuarioSesionHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/UsuarioSesionHibernateDAO.java @@ -36,14 +36,14 @@ public class UsuarioSesionHibernateDAO extends GenericHibernateDAO obtenerTodos() { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); return c.list(); } @Override public List buscar(Usuario usuario) { - return this.findByCriteria(Restrictions.eq("usuario", usuario),Restrictions.eq("activo", Boolean.TRUE)); + return this.findByCriteria(Restrictions.eq("usuario", usuario),Restrictions.eq(ACTIVO, Boolean.TRUE)); } @Override diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/UsuarioUbicacionHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/UsuarioUbicacionHibernateDAO.java index 4d36b62ed..17dbfb39b 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/UsuarioUbicacionHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/UsuarioUbicacionHibernateDAO.java @@ -33,7 +33,7 @@ public class UsuarioUbicacionHibernateDAO extends GenericHibernateDAO buscarPorUsuario(Usuario usuario) { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); c.add(Restrictions.eq("usuario", usuario)); return c.list(); @@ -42,7 +42,7 @@ public class UsuarioUbicacionHibernateDAO extends GenericHibernateDAO buscarPuntoVentaPorUsuario(Usuario usuario) { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); c.add(Restrictions.eq("usuario", usuario)); c.setProjection(Property.forName("puntoVenta")); c.createAlias("puntoVenta", "ptovta"); diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/ViaHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/ViaHibernateDAO.java index 1c19dd3bc..5ca8998c4 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/ViaHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/ViaHibernateDAO.java @@ -31,7 +31,7 @@ public class ViaHibernateDAO extends GenericHibernateDAO @Override public List obtenerTodos() { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); c.addOrder(Order.asc("nombvia")); return c.list(); @@ -39,7 +39,7 @@ public class ViaHibernateDAO extends GenericHibernateDAO public List buscar(String nombvia) { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); c.add(Restrictions.eq("nombvia", nombvia)); c.addOrder(Order.asc("nombvia")); diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/VigenciaTarifaHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/VigenciaTarifaHibernateDAO.java index 9139a06a7..48ad91022 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/VigenciaTarifaHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/VigenciaTarifaHibernateDAO.java @@ -36,7 +36,7 @@ public class VigenciaTarifaHibernateDAO extends @Override public List obtenerTodos() { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); c.addOrder(Order.asc("feciniciovigencia")); @@ -46,7 +46,7 @@ public class VigenciaTarifaHibernateDAO extends @Override public List pesquisar(Date inicio, Date fim) { Criteria c = getSession().createCriteria(getPersistentClass()); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); if (inicio != null) { c.add(Restrictions.eq("feciniciovigencia", inicio)); @@ -61,7 +61,7 @@ public class VigenciaTarifaHibernateDAO extends @Override public List buscarVigenciasIntervalo(VigenciaTarifa vt) { Criteria c = this.getSession().createCriteria(VigenciaTarifa.class); - c.add(Restrictions.eq("activo", Boolean.TRUE)); + c.add(Restrictions.eq(ACTIVO, Boolean.TRUE)); c.add(Restrictions.ge("fecfinvigencia", vt.getFeciniciovigencia())); c.add(Restrictions.le("feciniciovigencia", vt.getFecfinvigencia())); diff --git a/src/com/rjconsultores/ventaboletos/entidad/CaixaContrato.java b/src/com/rjconsultores/ventaboletos/entidad/CaixaContrato.java index d4ddfb8b6..3a59f0fb7 100644 --- a/src/com/rjconsultores/ventaboletos/entidad/CaixaContrato.java +++ b/src/com/rjconsultores/ventaboletos/entidad/CaixaContrato.java @@ -13,12 +13,17 @@ import javax.persistence.Table; import javax.persistence.Temporal; import javax.persistence.TemporalType; +import com.rjconsultores.ventaboletos.anotacao.Renderizado; +import com.rjconsultores.ventaboletos.enums.TipoLancamentoCaixa; + +import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; @Getter @Setter +@EqualsAndHashCode @NoArgsConstructor @Entity @Table(name = "CAIXA_CONTRATO") @@ -35,13 +40,19 @@ public class CaixaContrato { @Column(name = "DATA_LANCAMENTO") @Temporal(TemporalType.TIMESTAMP) + @Renderizado private Date dataLancamento; - @Column(name = "TIPO_LANCAMENTO_ID") - private Long tipoLancamentoId; - + @Renderizado @Column(name = "VALOR") private BigDecimal valor; + + @Column(name = "OBSERVACAO") + private String observacao; + + @Renderizado( conversor = TipoLancamentoCaixa.class ) + @Column(name = "TIPO_LANCAMENTO_ID") + private Integer tipoLancamentoId; @Column(name = "CAJA_ID") private Long cajaId; @@ -58,5 +69,9 @@ public class CaixaContrato { @Column(name = "FECMODIF") @Temporal(TemporalType.TIMESTAMP) private Date fecModif; + + public TipoLancamentoCaixa getTipoLancamentoCaixa() { + return TipoLancamentoCaixa.getTipoFormapagoByValor(tipoLancamentoId); + } } \ No newline at end of file diff --git a/src/com/rjconsultores/ventaboletos/entidad/ContratoCorporativo.java b/src/com/rjconsultores/ventaboletos/entidad/ContratoCorporativo.java index b1a3d8993..0d8e9a042 100644 --- a/src/com/rjconsultores/ventaboletos/entidad/ContratoCorporativo.java +++ b/src/com/rjconsultores/ventaboletos/entidad/ContratoCorporativo.java @@ -83,7 +83,7 @@ public class ContratoCorporativo implements Serializable { private Integer statusContrato; @Column(name = "GRUPOCONTRATO_ID") - private Integer grupoContratoId; + private Long grupoContratoId; @Column(name = "DESCONTO_FATURA") private BigDecimal descontoFatura; diff --git a/src/com/rjconsultores/ventaboletos/entidad/GrupoContrato.java b/src/com/rjconsultores/ventaboletos/entidad/GrupoContrato.java index f6672e36b..e7a199da9 100644 --- a/src/com/rjconsultores/ventaboletos/entidad/GrupoContrato.java +++ b/src/com/rjconsultores/ventaboletos/entidad/GrupoContrato.java @@ -39,7 +39,7 @@ public class GrupoContrato implements Serializable { @GeneratedValue(strategy = GenerationType.AUTO, generator = "GRUPO_CONTRATO_SEQ") @Renderizado @Column(name = "GRUPOCONTRATO_ID") - private Integer grupoContratoId; + private Long grupoContratoId; @Renderizado @Column(name = "NOMEGRUPOCONTRATO") diff --git a/src/com/rjconsultores/ventaboletos/entidad/TipoLancamentoCaixa.java b/src/com/rjconsultores/ventaboletos/entidad/TipoLancamentoCaixa.java deleted file mode 100644 index d8255b170..000000000 --- a/src/com/rjconsultores/ventaboletos/entidad/TipoLancamentoCaixa.java +++ /dev/null @@ -1,48 +0,0 @@ -package com.rjconsultores.ventaboletos.entidad; - -import java.util.Date; - -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.SequenceGenerator; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; - -import lombok.Getter; -import lombok.NoArgsConstructor; -import lombok.Setter; - -@Getter -@Setter -@NoArgsConstructor -@Entity -@Table(name = "TIPO_LANCAMENTO_CAIXA") -@SequenceGenerator(name = "TIPO_LANCAMENTO_CAIXA_SEQ", sequenceName = "TIPO_LANCAMENTO_CAIXA_SEQ", allocationSize = 1) -public class TipoLancamentoCaixa { - - @Id - @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "TIPO_LANCAMENTO_CAIXA_SEQ") - @Column(name = "TIPO_LANCAMENTO_ID") - private Long tipoLancamentoId; - - @Column(name = "NOME_LANCAMENTO") - private String nomeLancamento; - - @Column(name = "IND_ACRESCIMO") - private boolean indAcrescimo; - - @Column(name = "USUARIO_ID") - private Integer usuarioId; - - @Column(name = "ACTIVO") - private boolean activo; - - @Column(name = "FECMODIF") - @Temporal(TemporalType.TIMESTAMP) - private Date fecModif; - -} \ No newline at end of file diff --git a/src/com/rjconsultores/ventaboletos/enums/TipoLancamentoCaixa.java b/src/com/rjconsultores/ventaboletos/enums/TipoLancamentoCaixa.java new file mode 100644 index 000000000..ad52b132b --- /dev/null +++ b/src/com/rjconsultores/ventaboletos/enums/TipoLancamentoCaixa.java @@ -0,0 +1,57 @@ +package com.rjconsultores.ventaboletos.enums; + +import org.zkoss.util.resource.Labels; + +public enum TipoLancamentoCaixa { + + ACRESCIMO(0,Labels.getLabel("label.tipoLancamento.acrescimo"), true), + REDUCAO(1,Labels.getLabel("label.tipoLancamento.reducao"), false), + BONUS(2,Labels.getLabel("label.tipoLancamento.bonus"), false), + DESPESA(3,Labels.getLabel("label.tipoLancamento.despesa"), false), + BILHETE_CONFIRMADO(4,Labels.getLabel("label.tipoLancamento.bilheteConfirmado"), false), + BILHETE_ABERTO(5,Labels.getLabel("label.tipoLancamento.bilheteAberto"), false), + EVENTO_EXTRA(6,Labels.getLabel("label.tipoLancamento.eventoExtra"), false), + ; + + private Integer valor; + private String descricao; + private boolean indAdicao; + + private TipoLancamentoCaixa(Integer valor, String descricao, boolean indAdicao) { + this.valor = valor; + this.descricao = descricao; + this.indAdicao = indAdicao; + } + + public String getDescricao() { + return descricao; + } + + @Override + public String toString() { + return getDescricao(); + } + + public Integer getValor() { + return valor; + } + + public static TipoLancamentoCaixa getTipoFormapagoByValor(Integer valor) { + + for (TipoLancamentoCaixa tipo : TipoLancamentoCaixa.values()) { + if (tipo.getValor().equals(valor)) { + return tipo; + } + } + return null; + } + + public static TipoLancamentoCaixa buscarPeloValor(String valor) { + return getTipoFormapagoByValor( Integer.valueOf(valor)); + } + + public boolean isIndAdicao() { + return indAdicao; + } + +} diff --git a/src/com/rjconsultores/ventaboletos/service/CaixaContratoService.java b/src/com/rjconsultores/ventaboletos/service/CaixaContratoService.java new file mode 100644 index 000000000..d5e9e2506 --- /dev/null +++ b/src/com/rjconsultores/ventaboletos/service/CaixaContratoService.java @@ -0,0 +1,12 @@ +package com.rjconsultores.ventaboletos.service; + +import java.util.List; + +import com.rjconsultores.ventaboletos.entidad.CaixaContrato; + +public interface CaixaContratoService extends GenericService { + + public List buscarExtratoContrato(Long contratoId ); + + public CaixaContrato gravarMovimento( CaixaContrato caixa ); +} diff --git a/src/com/rjconsultores/ventaboletos/service/GrupoContratoService.java b/src/com/rjconsultores/ventaboletos/service/GrupoContratoService.java index e8ba8e3e7..723370ba6 100644 --- a/src/com/rjconsultores/ventaboletos/service/GrupoContratoService.java +++ b/src/com/rjconsultores/ventaboletos/service/GrupoContratoService.java @@ -6,7 +6,7 @@ import com.rjconsultores.ventaboletos.entidad.ExcecaoGrupoContrato; import com.rjconsultores.ventaboletos.entidad.GrupoContrato; import com.rjconsultores.ventaboletos.entidad.TarifaGrupoContrato; -public interface GrupoContratoService extends GenericService { +public interface GrupoContratoService extends GenericService { public List buscar(String descgrupo); diff --git a/src/com/rjconsultores/ventaboletos/service/impl/CaixaContratoServiceImpl.java b/src/com/rjconsultores/ventaboletos/service/impl/CaixaContratoServiceImpl.java new file mode 100644 index 000000000..0a013460d --- /dev/null +++ b/src/com/rjconsultores/ventaboletos/service/impl/CaixaContratoServiceImpl.java @@ -0,0 +1,60 @@ +package com.rjconsultores.ventaboletos.service.impl; + +import java.util.Calendar; +import java.util.List; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import com.rjconsultores.ventaboletos.dao.CaixaContratoDAO; +import com.rjconsultores.ventaboletos.entidad.CaixaContrato; +import com.rjconsultores.ventaboletos.service.CaixaContratoService; +import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; + + +@Service("caixaContratoService") +public class CaixaContratoServiceImpl implements CaixaContratoService { + + @Autowired + private CaixaContratoDAO caixaContratoDAO; + + public CaixaContrato obtenerID(Long id) { + return caixaContratoDAO.obtenerID(id); + } + + @Transactional + public CaixaContrato suscribir(CaixaContrato entidad) { + entidad.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + entidad.setFecModif(Calendar.getInstance().getTime()); + entidad.setActivo(Boolean.TRUE); + + return caixaContratoDAO.suscribir(entidad); + } + + @Override + public List obtenerTodos() { + return caixaContratoDAO.obtenerTodos(); + } + + @Override + public CaixaContrato actualizacion(CaixaContrato entidad) { + throw new RuntimeException("Esse componente não implementa esse metodo"); + } + + @Override + public void borrar(CaixaContrato entidad) { + throw new RuntimeException("Esse componente não implementa esse metodo"); + } + + @Override + public List buscarExtratoContrato(Long contratoId) { + return caixaContratoDAO.buscarExtratoContrato(contratoId); + } + + @Override + @Transactional + public CaixaContrato gravarMovimento(CaixaContrato caixa) { + return caixaContratoDAO.gravarMovimento(caixa); + } +} diff --git a/src/com/rjconsultores/ventaboletos/service/impl/GrupoContratoServiceImpl.java b/src/com/rjconsultores/ventaboletos/service/impl/GrupoContratoServiceImpl.java index 9dfa688e1..0ff3562c6 100644 --- a/src/com/rjconsultores/ventaboletos/service/impl/GrupoContratoServiceImpl.java +++ b/src/com/rjconsultores/ventaboletos/service/impl/GrupoContratoServiceImpl.java @@ -33,7 +33,7 @@ public class GrupoContratoServiceImpl implements GrupoContratoService { return grupoContratoDAO.obtenerTodos(); } - public GrupoContrato obtenerID(Integer id) { + public GrupoContrato obtenerID(Long id) { return grupoContratoDAO.obtenerID(id); }