diff --git a/src/com/rjconsultores/ventaboletos/constantes/Constantes.java b/src/com/rjconsultores/ventaboletos/constantes/Constantes.java index 43b42ce51..71e2783e4 100644 --- a/src/com/rjconsultores/ventaboletos/constantes/Constantes.java +++ b/src/com/rjconsultores/ventaboletos/constantes/Constantes.java @@ -1,5 +1,10 @@ package com.rjconsultores.ventaboletos.constantes; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; + + public class Constantes { public static final Long FORMA_PAGO_RESERVA = new Long(94); @@ -18,6 +23,9 @@ public class Constantes { public static Long TPV_RESERVACION_POR_INTERNET = new Long(16); public static Long TPV_POR_INTERNET = new Long(12); public static Long TPV_AGENCIA_WEB = new Long(19); + + public static List ORGAOS_CONCEDENTES_CALCULO_ARTESP = new ArrayList(Arrays.asList(new Integer[]{21})) ; + public static List ORGAOS_CONCEDENTES_CALCULO_ANTT = new ArrayList(Arrays.asList(new Integer[]{3,22,15})); public static String CLAVE_EDITAR_COMISSAO = "COM.RJCONSULTORES.ADMINISTRACION.PUNTOVENTA.EDITARCOMISSAO"; diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/CalcularPeajeHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/CalcularPeajeHibernateDAO.java index 1a83331a2..9cd86f249 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/CalcularPeajeHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/CalcularPeajeHibernateDAO.java @@ -1,8 +1,7 @@ package com.rjconsultores.ventaboletos.dao.hibernate; -import java.math.BigDecimal; +import java.math.BigDecimal; import java.sql.Connection; -import java.sql.ResultSet; import java.sql.SQLException; import java.sql.Statement; import java.util.ArrayList; @@ -16,6 +15,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.stereotype.Repository; +import com.rjconsultores.ventaboletos.constantes.Constantes; import com.rjconsultores.ventaboletos.dao.CalcularPeajeDAO; import com.rjconsultores.ventaboletos.entidad.OrgaoConcedente; import com.rjconsultores.ventaboletos.entidad.Ruta; @@ -126,7 +126,7 @@ public class CalcularPeajeHibernateDAO extends GenericHibernateDAO