From ee363c6cda4c244bd0d0d2d3aa4ce4e8a324612d Mon Sep 17 00:00:00 2001
From: frederico <frederico@d1611594-4594-4d17-8e1d-87c2c4800839>
Date: Mon, 12 Sep 2016 18:21:42 +0000
Subject: [PATCH] fixed bug #7908

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Model/trunk/modelWeb@60215 d1611594-4594-4d17-8e1d-87c2c4800839
---
 .../hibernate/ConferenciaComissaoHibernateDAO.java   | 12 +++++++++---
 .../ventaboletos/vo/comissao/BoletoComissao.java     |  9 +++++++++
 2 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/ConferenciaComissaoHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/ConferenciaComissaoHibernateDAO.java
index 8ce452db1..d3e81db4d 100644
--- a/src/com/rjconsultores/ventaboletos/dao/hibernate/ConferenciaComissaoHibernateDAO.java
+++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/ConferenciaComissaoHibernateDAO.java
@@ -673,7 +673,8 @@ public class ConferenciaComissaoHibernateDAO extends GenericHibernateDAO<Confere
 					.append("BO1.TIPOVENTA_ID \"tipoVentaOriginal1\", BO2.TIPOVENTA_ID \"tipoVentaOriginal2\", OCD.OCD_ID \"ocdId\", ")
 					.append("B.NOMBPASAJERO AS \"nombpasajero\", E.INDCARBOLETOSDEVOLVIDOSCONF AS \"indcarboletosdevolvidosconf\", ")
 					.append("B.FECCORRIDA AS \"feccorrida\", B.CORRIDA_ID \"corridaId\", B.BOLETOORIGINAL_ID AS \"boletoOriginalId\", ")
-					.append("BO1.MOTIVOCANCELACION_ID \"motivoCancelacionOriginal1\", BO2.MOTIVOCANCELACION_ID \"motivoCancelacionOriginal2\" ")
+					.append("BO1.MOTIVOCANCELACION_ID \"motivoCancelacionOriginal1\", BO2.MOTIVOCANCELACION_ID \"motivoCancelacionOriginal2\", ")
+					.append("tarifa.PRECIO AS \"valorBilhete\"")
 					.append("FROM BOLETO B ")
 					.append("LEFT JOIN BOLETO BO1 ON BO1.BOLETO_ID = B.BOLETOORIGINAL_ID ")
 					.append("LEFT JOIN BOLETO BO2 ON BO2.BOLETO_ID = BO1.BOLETOORIGINAL_ID ")
@@ -691,9 +692,13 @@ public class ConferenciaComissaoHibernateDAO extends GenericHibernateDAO<Confere
 					.append("INNER JOIN EMPRESA E ON E.EMPRESA_ID = M.EMPRESA_ID ")
 					.append("LEFT JOIN COM_EMP_FORMAPAGO COMFP ON COMFP.FORMAPAGO_ID = FP.FORMAPAGO_ID AND COMFP.EMPRESA_ID = M.EMPRESA_ID AND COMFP.ACTIVO = 1 ")
 					.append("LEFT JOIN COM_EMP_CATEGORIA COMCAT ON COMCAT.CATEGORIA_ID = B.CATEGORIA_ID AND COMCAT.EMPRESA_ID = M.EMPRESA_ID AND COMCAT.ACTIVO = 1 ")
+					.append("INNER JOIN TARIFA tarifa ON (tarifa.RUTA_ID = B.RUTA_ID AND tarifa.ORIGEN_ID = B.ORIGEN_ID AND tarifa.DESTINO_ID = B.DESTINO_ID) ")
+					.append("INNER JOIN VIGENCIA_TARIFA vigenciaTarifa ON (vigenciaTarifa.VIGENCIATARIFA_ID = tarifa.VIGENCIATARIFA_ID) ")
 					.append("WHERE B.ACTIVO = 1 ")
-					.append("AND B.FECHORVENTA BETWEEN TO_DATE(:dataMovimentoInicial, 'DD/MM/YYYY HH24:MI') AND TO_DATE(:dataMovimentoFinal, 'DD/MM/YYYY HH24:MI') ");
-
+					.append("AND B.FECHORVENTA BETWEEN TO_DATE(:dataMovimentoInicial, 'DD/MM/YYYY HH24:MI') AND TO_DATE(:dataMovimentoFinal, 'DD/MM/YYYY HH24:MI') ")
+					.append("AND B.FECHORVENTA BETWEEN vigenciaTarifa.FECINICIOVIGENCIA AND vigenciaTarifa.FECFINVIGENCIA ");
+			
+			
 			if (parametros.containsKey("empresaId")) {
 				sQuery.append("AND M.EMPRESA_ID = :empresaId ");
 			}
@@ -716,6 +721,7 @@ public class ConferenciaComissaoHibernateDAO extends GenericHibernateDAO<Confere
 					.addScalar("numFolioPreImpreso", Hibernate.STRING)
 					.addScalar("uf", Hibernate.STRING).addScalar("desccategoria", Hibernate.STRING)
 					.addScalar("valorpagado", Hibernate.BIG_DECIMAL)
+					.addScalar("valorBilhete", Hibernate.BIG_DECIMAL)
 					.addScalar("seguroOutros", Hibernate.BIG_DECIMAL)
 					.addScalar("pedagio", Hibernate.BIG_DECIMAL)
 					.addScalar("seguro", Hibernate.BIG_DECIMAL)
diff --git a/src/com/rjconsultores/ventaboletos/vo/comissao/BoletoComissao.java b/src/com/rjconsultores/ventaboletos/vo/comissao/BoletoComissao.java
index f2e16f171..02c73e586 100644
--- a/src/com/rjconsultores/ventaboletos/vo/comissao/BoletoComissao.java
+++ b/src/com/rjconsultores/ventaboletos/vo/comissao/BoletoComissao.java
@@ -24,6 +24,7 @@ public class BoletoComissao {
 	private Integer motivoCancelacionOriginal2;
 	private String descmotivocancelacion;
 	private BigDecimal valorpagado;
+	private BigDecimal valorBilhete;
 	private BigDecimal seguro;
 	private BigDecimal pedagio;
 	private BigDecimal embarque;
@@ -866,6 +867,14 @@ public class BoletoComissao {
 	public void setCorridaId(Integer corridaId) {
 		this.corridaId = corridaId;
 	}
+	
+	public BigDecimal getValorBilhete() {
+		return valorBilhete;
+	}
+
+	public void setValorBilhete(BigDecimal valorBilhete) {
+		this.valorBilhete = valorBilhete;
+	}
 
 	public String getFeccorridaServico() {
 		StringBuilder str = new StringBuilder();