From db428b22039221783d57a3e023a7ee9b8fb0cac3 Mon Sep 17 00:00:00 2001
From: thiago <thiago@d1611594-4594-4d17-8e1d-87c2c4800839>
Date: Tue, 13 Oct 2015 19:16:55 +0000
Subject: [PATCH] =?UTF-8?q?fixed=20bug=20#6735=20-=20Incluidos=20org=C3=A3?=
 =?UTF-8?q?os=20concedentes=20com=20mesmos=20c=C3=A1lculo=20da=20antt.=20A?=
 =?UTF-8?q?lterado=20c=C3=B3digo=20para=20verificarem=20duas=20listas(=20O?=
 =?UTF-8?q?RGAOS=5FCONCEDENTES=5FCALCULO=5FANTT=20e=20ORGAOS=5FCONCEDENTES?=
 =?UTF-8?q?=5FCALCULO=5FARTESP)=20e=20caso=20sejam=20inseridos=20novos=20?=
 =?UTF-8?q?=C3=B3rg=C3=A3os=20que=20sejam=20adicionados=20nessas=20listas?=
 =?UTF-8?q?=20e=20passar=C3=A3o=20a=20calcular=20conforme=20um=20desses=20?=
 =?UTF-8?q?=C3=B3rg=C3=A3os=20principais.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Model/trunk/modelWeb@48934 d1611594-4594-4d17-8e1d-87c2c4800839
---
 .../rjconsultores/ventaboletos/constantes/Constantes.java | 8 ++++++++
 .../dao/hibernate/CalcularPeajeHibernateDAO.java          | 8 ++++----
 2 files changed, 12 insertions(+), 4 deletions(-)

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<Integer> ORGAOS_CONCEDENTES_CALCULO_ARTESP = new ArrayList<Integer>(Arrays.asList(new Integer[]{21})) ;
+	public static List<Integer> ORGAOS_CONCEDENTES_CALCULO_ANTT = new ArrayList<Integer>(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<String, Strin
 							BigDecimal indice = orgao.getIndicePeaje();
 							BigDecimal pedagioPuro = pvo.getImportePeaje();
 							BigDecimal pedagioCalculado = BigDecimal.valueOf(0);
-							if(orgao.getOrgaoConcedenteId() == 21){ // 21 = artesp
+							if(Constantes.ORGAOS_CONCEDENTES_CALCULO_ARTESP.contains(orgao.getOrgaoConcedenteId())){ // 21 = artesp
 								if(qtdEixos == null || cantAsientos == null ){
 									int[] x ={-1,r.getRutaId()}; 
 									return   x;}else{
@@ -136,7 +136,7 @@ public class CalcularPeajeHibernateDAO extends GenericHibernateDAO<String, Strin
 										}
 									}
 								pedagioCalculado = BigDecimal.valueOf(((pedagioPuro.doubleValue() * qtdEixos) / indice.doubleValue()));
-							}else if(orgao.getOrgaoConcedenteId() == 3){// 3 = antt
+							}else if(Constantes.ORGAOS_CONCEDENTES_CALCULO_ANTT.contains(orgao.getOrgaoConcedenteId())){// 3 = antt
 								if(qtdEixos == null || cantAsientos == null ){
 									int[] x ={-1,r.getRutaId()}; 
 									return   x;}else{