From 7a117d772800ceff0f96eb131d7a6efb029c2c42 Mon Sep 17 00:00:00 2001
From: gleimar <gleimar@d1611594-4594-4d17-8e1d-87c2c4800839>
Date: Tue, 21 Aug 2012 17:59:26 +0000
Subject: [PATCH] git-svn-id:
 http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Model/trunk/modelWeb@20626
 d1611594-4594-4d17-8e1d-87c2c4800839

---
 .../dao/sqlbuilder/impl/SQLBuilderOracle.java          |  3 ++-
 .../ventaboletos/service/TarifaOficialService.java     | 10 ++++++++++
 .../service/impl/TarifaOficialServiceImpl.java         | 10 ++++++++++
 3 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/src/com/rjconsultores/ventaboletos/dao/sqlbuilder/impl/SQLBuilderOracle.java b/src/com/rjconsultores/ventaboletos/dao/sqlbuilder/impl/SQLBuilderOracle.java
index aa40a2416..e9654da41 100644
--- a/src/com/rjconsultores/ventaboletos/dao/sqlbuilder/impl/SQLBuilderOracle.java
+++ b/src/com/rjconsultores/ventaboletos/dao/sqlbuilder/impl/SQLBuilderOracle.java
@@ -80,6 +80,7 @@ public class SQLBuilderOracle implements SQLBuilder {
 			sb.append("    and r.ruta_id = ").append(codRuta);
 		}
 		sb.append("    and r.activo = 1 ");
+		sb.append("    and tc.activo = 1 ");
 		sb.append("    and m.moneda_id = 1 ");
 		sb.append("    and oc.orgaoconcedente_id = 3 ");
 		sb.append("    and  ");
@@ -138,7 +139,7 @@ public class SQLBuilderOracle implements SQLBuilder {
 		sb.append("where  ");
 		sb.append("    activo = 1 ");
 		if (rutaId != null){
-			sb.append("    ruta_id = ").append(rutaId);
+			sb.append(" and ruta_id = ").append(rutaId);
 		}
 		
 
diff --git a/src/com/rjconsultores/ventaboletos/service/TarifaOficialService.java b/src/com/rjconsultores/ventaboletos/service/TarifaOficialService.java
index 35a159ceb..a39c8daae 100644
--- a/src/com/rjconsultores/ventaboletos/service/TarifaOficialService.java
+++ b/src/com/rjconsultores/ventaboletos/service/TarifaOficialService.java
@@ -29,6 +29,16 @@ public interface TarifaOficialService {
 	 */
 	public Integer atualizarTarifaANTT(Integer rutaId);
 	
+	/**
+	 * Gera as novas tarifas e atualiza as já existentes
+	 * 
+	 * Utiliza os métodos {@link #gerarTarifaANTT(Integer)} e {@link #atualizarTarifaANTT(Integer)}
+	 * 
+	 * @param rudaId
+	 * @return - Retorna o total de registros inseridos + atualizados
+	 */
+	public Integer gerarAtualizarTarifaANTT(Integer rudaId);
+	
 	/**
 	 * Copia a tarifa oficial para a tabela de tarifa de acordo com a vigencia especificada
 	 * @param vigenciaTarifa
diff --git a/src/com/rjconsultores/ventaboletos/service/impl/TarifaOficialServiceImpl.java b/src/com/rjconsultores/ventaboletos/service/impl/TarifaOficialServiceImpl.java
index f6db041aa..911d5a5da 100644
--- a/src/com/rjconsultores/ventaboletos/service/impl/TarifaOficialServiceImpl.java
+++ b/src/com/rjconsultores/ventaboletos/service/impl/TarifaOficialServiceImpl.java
@@ -33,4 +33,14 @@ public class TarifaOficialServiceImpl implements TarifaOficialService {
 		tarifaOficialDAO.copiarParaTarifa(vigenciaTarifa, UsuarioLogado.getUsuarioLogado().getUsuarioId());
 	}
 
+	@Override
+	@Transactional
+	public Integer gerarAtualizarTarifaANTT(Integer rudaId) {
+		
+		Integer qtd = gerarTarifaANTT(rudaId);
+		qtd += atualizarTarifaANTT(rudaId);
+		
+		return qtd;
+	}
+
 }