From 286d0aea348ec9d5d31257ea8c13dece444ee509 Mon Sep 17 00:00:00 2001 From: fabio Date: Mon, 9 Nov 2020 23:17:49 +0000 Subject: [PATCH] fixes bug#20931 dev: Gleimar qua: git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Model/trunk/modelWeb@104210 d1611594-4594-4d17-8e1d-87c2c4800839 --- .../OperadorEmbarcadaServicoHibernateDAO.java | 227 +++++++++--------- .../dao/hibernate/TramoHibernateDAO.java | 1 - 2 files changed, 107 insertions(+), 121 deletions(-) diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/OperadorEmbarcadaServicoHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/OperadorEmbarcadaServicoHibernateDAO.java index 672d83fb5..d945c14b9 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/OperadorEmbarcadaServicoHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/OperadorEmbarcadaServicoHibernateDAO.java @@ -3,6 +3,7 @@ package com.rjconsultores.ventaboletos.dao.hibernate; import java.math.BigDecimal; import java.util.ArrayList; import java.util.Date; +import java.util.HashSet; import java.util.List; import org.apache.commons.collections.CollectionUtils; @@ -51,6 +52,9 @@ public class OperadorEmbarcadaServicoHibernateDAO extends GenericHibernateDAO tramosequencia = query.list(); CategoriaDescuento categoriaDescuento = categoriaDescuentoDAO.pesquisarPorCategoriaEmpresa(Constantes.CATEGORIA_NORMAL, corrida.getEmpresaId()); - List lsTramo = new ArrayList(); + HashSet setTramo = new HashSet(); List aliasLs = aliasServicoService.buscarPorRuta(corrida.getRutaId()); @@ -648,9 +634,10 @@ public class OperadorEmbarcadaServicoHibernateDAO extends GenericHibernateDAO lsTramo = new ArrayList(setTramo); corrida.setLsTramoVO(lsTramo); } diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/TramoHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/TramoHibernateDAO.java index fe0442cc8..469b84a7b 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/TramoHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/TramoHibernateDAO.java @@ -213,7 +213,6 @@ public class TramoHibernateDAO extends GenericHibernateDAO sql.append(" coalesce(ta.importeoutros, 0) AS valorOutros, "); sql.append(" coalesce(ta.importeseguro, 0) AS valorSeguro, "); sql.append(" coalesce(ta.precio, 0) AS valorTarifa "); -// sql.append(" , co.ruta_id AS rutaId "); sql.append(" FROM "); sql.append(" ruta_combinacion rc "); sql.append(" JOIN tramo trm ON trm.tramo_id = rc.tramo_id AND trm.activo = 1 ");