diff --git a/pom.xml b/pom.xml
index d352d10e3..624202de0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
4.0.0
br.com.rjconsultores
ModelWeb
- 1.60.0
+ 1.60.1
diff --git a/src/com/rjconsultores/ventaboletos/dao/TarifaOficialDAO.java b/src/com/rjconsultores/ventaboletos/dao/TarifaOficialDAO.java
index cb6cc466d..fb4519712 100644
--- a/src/com/rjconsultores/ventaboletos/dao/TarifaOficialDAO.java
+++ b/src/com/rjconsultores/ventaboletos/dao/TarifaOficialDAO.java
@@ -105,4 +105,6 @@ public interface TarifaOficialDAO extends GenericDAO {
public List oberTarifaOficialComComposicaoDoPedagioVo(Integer empresaId);
public void atualizarPedagioComFiltroDePracaDePedagio(Integer tarifaOficialId, BigDecimal importePedagio, String composicaoPedagio );
+
+ public void removerDuplicidadeNaTarifaOficial();
}
diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/TarifaOficialHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/TarifaOficialHibernateDAO.java
index 7c611fd30..1cf52a21e 100644
--- a/src/com/rjconsultores/ventaboletos/dao/hibernate/TarifaOficialHibernateDAO.java
+++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/TarifaOficialHibernateDAO.java
@@ -597,5 +597,15 @@ public class TarifaOficialHibernateDAO extends GenericHibernateDAO dados, Integer usuarioId, Boolean calculaPegagio, Boolean calculaTarifa, Boolean calculaTaxaEmbarque, Boolean calculaSeguro, Boolean calculaTPP);
+
+ public String getSqlRemoverDuplicidadeNaTarifaOficial();
}
diff --git a/src/com/rjconsultores/ventaboletos/dao/sqlbuilder/impl/SQLBuilderOracle.java b/src/com/rjconsultores/ventaboletos/dao/sqlbuilder/impl/SQLBuilderOracle.java
index 649634d49..411a86763 100644
--- a/src/com/rjconsultores/ventaboletos/dao/sqlbuilder/impl/SQLBuilderOracle.java
+++ b/src/com/rjconsultores/ventaboletos/dao/sqlbuilder/impl/SQLBuilderOracle.java
@@ -1490,4 +1490,21 @@ public class SQLBuilderOracle implements SQLBuilder {
return sb.toString();
}
+
+ @Override
+ public String getSqlRemoverDuplicidadeNaTarifaOficial() {
+ // TODO Auto-generated method stub
+ StringBuilder sb = new StringBuilder("DELETE FROM tarifa_oficial ");
+ sb.append("WHERE ROWID IN ( ");
+ sb.append("SELECT rid FROM( ");
+ sb.append("SELECT ROWID rid, ROW_NUMBER() ");
+ sb.append("OVER(PARTITION BY orgaoconcedente_id, ruta_id, tramo_id, claseservicio_id, marca_id ORDER BY ROWID) rn ");
+ sb.append("FROM tarifa_oficial) ");
+ sb.append("WHERE rn <> 1 )");
+
+ return sb.toString();
+ }
+
+
+
}
\ No newline at end of file
diff --git a/src/com/rjconsultores/ventaboletos/service/impl/TarifaOficialServiceImpl.java b/src/com/rjconsultores/ventaboletos/service/impl/TarifaOficialServiceImpl.java
index 5540b101e..0c1782a5e 100644
--- a/src/com/rjconsultores/ventaboletos/service/impl/TarifaOficialServiceImpl.java
+++ b/src/com/rjconsultores/ventaboletos/service/impl/TarifaOficialServiceImpl.java
@@ -123,6 +123,8 @@ public class TarifaOficialServiceImpl implements TarifaOficialService {
}
x--;
}while(x > 0);
+
+ tarifaOficialDAO.removerDuplicidadeNaTarifaOficial();
}
@Override