From bd493107b4e6735be0a6aa601ac59a63587edc04 Mon Sep 17 00:00:00 2001
From: thiago <thiago@d1611594-4594-4d17-8e1d-87c2c4800839>
Date: Tue, 31 Oct 2017 16:55:32 +0000
Subject: [PATCH] =?UTF-8?q?Corre=C3=A7=C3=A3o=20bugs=20Aguia=20Branca.?=
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@75894 d1611594-4594-4d17-8e1d-87c2c4800839
---
 .../dao/hibernate/RegionMetropolitanaHibernateDAO.java |  3 ++-
 .../ventaboletos/entidad/PricingEspecifico.java        |  9 +++++++++
 .../ventaboletos/entidad/ReservacionCtrl.java          | 10 ++++++++++
 3 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/RegionMetropolitanaHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/RegionMetropolitanaHibernateDAO.java
index a84da1802..477e56a05 100644
--- a/src/com/rjconsultores/ventaboletos/dao/hibernate/RegionMetropolitanaHibernateDAO.java
+++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/RegionMetropolitanaHibernateDAO.java
@@ -4,6 +4,7 @@ import java.util.List;
 
 import org.hibernate.Criteria;
 import org.hibernate.SessionFactory;
+import org.hibernate.criterion.Projections;
 import org.hibernate.criterion.Restrictions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
@@ -26,7 +27,7 @@ public class RegionMetropolitanaHibernateDAO extends GenericHibernateDAO<RegionM
 		Criteria c = getSession().createCriteria(getPersistentClass());
 		c.add(Restrictions.eq("activo", Boolean.TRUE));
 
-		return c.list();
+		return c.setResultTransformer(Criteria.DISTINCT_ROOT_ENTITY).list();
 	}
 
 }
diff --git a/src/com/rjconsultores/ventaboletos/entidad/PricingEspecifico.java b/src/com/rjconsultores/ventaboletos/entidad/PricingEspecifico.java
index cf051d7c0..fc0467f58 100644
--- a/src/com/rjconsultores/ventaboletos/entidad/PricingEspecifico.java
+++ b/src/com/rjconsultores/ventaboletos/entidad/PricingEspecifico.java
@@ -247,6 +247,9 @@ public class PricingEspecifico implements Serializable, Cloneable {
 	}
 
 	public List<PricingEspecificoOcupacion> getPricingEspecificoOcupacionsList() {
+		if(this.pricingEspecificoOcupacionsList == null){
+			this.pricingEspecificoOcupacionsList = new ArrayList<PricingEspecificoOcupacion>();
+		}
 		return this.pricingEspecificoOcupacionsList;
 	}
 
@@ -263,6 +266,9 @@ public class PricingEspecifico implements Serializable, Cloneable {
 	}
 	
 	public List<PricingEspecificoAgencia> getPricingEspecificoAgenciasList() {
+		if(this.pricingEspecificoAgenciasList == null){
+			this.pricingEspecificoAgenciasList = new ArrayList<PricingEspecificoAgencia>();
+		}
 		return pricingEspecificoAgenciasList;
 	}
 
@@ -272,6 +278,9 @@ public class PricingEspecifico implements Serializable, Cloneable {
 	
 
 	public List<PricingEspecificoCanalVendas> getPricingEspecificoCanalVendasList() {
+		if(this.pricingEspecificoCanalVendasList == null){
+			this.pricingEspecificoCanalVendasList = new ArrayList<PricingEspecificoCanalVendas>();
+		}
 		return pricingEspecificoCanalVendasList;
 	}
 
diff --git a/src/com/rjconsultores/ventaboletos/entidad/ReservacionCtrl.java b/src/com/rjconsultores/ventaboletos/entidad/ReservacionCtrl.java
index d1140e13b..a2f9da200 100644
--- a/src/com/rjconsultores/ventaboletos/entidad/ReservacionCtrl.java
+++ b/src/com/rjconsultores/ventaboletos/entidad/ReservacionCtrl.java
@@ -98,6 +98,8 @@ public class ReservacionCtrl implements Serializable {
 	@Column(name = "TIEMPOLIBERACIONINTERNETCADUC")
 	@Temporal(TemporalType.TIMESTAMP)
 	private Date tiempoliberacioninternetCaduc;
+	@Column(name = "INDTIPORESERVA")
+	private Boolean indTipoReserva;
 
 	public ReservacionCtrl() {
 	}
@@ -478,4 +480,12 @@ public class ReservacionCtrl implements Serializable {
 	public String toString() {
 		return "com.rjconsultores.ventaboletos.entidad.ReservacionCtrl[reservacionctrlId=" + reservacionctrlId + "]";
 	}
+
+	public Boolean getIndTipoReserva() {
+		return indTipoReserva;
+	}
+
+	public void setIndTipoReserva(Boolean indTipoReserva) {
+		this.indTipoReserva = indTipoReserva;
+	}
 }