From 97016377772b3ba745444a0494a2aafdb91c4d47 Mon Sep 17 00:00:00 2001
From: leonardo <leonardo@d1611594-4594-4d17-8e1d-87c2c4800839>
Date: Fri, 13 Dec 2019 17:55:10 +0000
Subject: [PATCH] =?UTF-8?q?17544:=20Retorno=20Icms=20pre=C3=A7o=20Linha=20?=
 =?UTF-8?q?fixes=20bug#17544=20dev:=20qua:marcelo?=
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@99363 d1611594-4594-4d17-8e1d-87c2c4800839
---
 .../OperadorEmbarcadaLinhaHibernateDAO.java   |  2 +-
 .../ventaboletos/vo/ruta/RutaVO.java          | 44 ++++++++++++++++++-
 2 files changed, 43 insertions(+), 3 deletions(-)

diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/OperadorEmbarcadaLinhaHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/OperadorEmbarcadaLinhaHibernateDAO.java
index 05dca0cc2..3eb927062 100644
--- a/src/com/rjconsultores/ventaboletos/dao/hibernate/OperadorEmbarcadaLinhaHibernateDAO.java
+++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/OperadorEmbarcadaLinhaHibernateDAO.java
@@ -36,7 +36,7 @@ public class OperadorEmbarcadaLinhaHibernateDAO  extends GenericHibernateDAO<Ope
 	public List<RutaVO> getListaRutaVO(Integer operador) {
 		StringBuilder sb = new StringBuilder();
 		sb.append(" SELECT ");
-		sb.append(" new com.rjconsultores.ventaboletos.vo.ruta.RutaVO(RT.rutaId, RT.numRuta, RT.prefixo, RT.descruta, ORC.orgaoConcedenteId, ORC.descOrgao, ORC.indValDocObligatorioEmbarcada, RT.indSentidoIda, CLA.claseservicioId, CLA.descclase) ");
+		sb.append(" new com.rjconsultores.ventaboletos.vo.ruta.RutaVO(RT.rutaId, RT.numRuta, RT.prefixo, RT.descruta, ORC.orgaoConcedenteId, ORC.descOrgao, ORC.indValDocObligatorioEmbarcada, RT.indSentidoIda, CLA.claseservicioId, CLA.descclase, RT.indTribTarifa, RT.indTribTaxaEmbarque, RT.indTribPedagio) ");
 		sb.append(" FROM OperadorEmbarcadaLinha OPL ");
 		sb.append(" INNER JOIN OPL.ruta RT ");
 		sb.append(" INNER JOIN OPL.operadorEmbarcada OPE ");
diff --git a/src/com/rjconsultores/ventaboletos/vo/ruta/RutaVO.java b/src/com/rjconsultores/ventaboletos/vo/ruta/RutaVO.java
index 0c6873be7..18a50ea58 100644
--- a/src/com/rjconsultores/ventaboletos/vo/ruta/RutaVO.java
+++ b/src/com/rjconsultores/ventaboletos/vo/ruta/RutaVO.java
@@ -15,6 +15,9 @@ public class RutaVO {
 	private String orgaoConcedente;
 	private Boolean sentido;
 	private ClaseVO claseVO;
+	private Boolean indTribTarifa;
+	private Boolean indTribTaxaEmbarque;
+	private Boolean indTribPedagio;
 	private OrgaoConcedenteVO orgaoConcedenteVO;
 	
 	
@@ -54,6 +57,21 @@ public class RutaVO {
 		this.claseVO = new ClaseVO(claseId, descClase);
 	}
 
+	public RutaVO(Integer rutaId, String numRuta, String prefixo, String descruta, Integer orgaoConcedenteId, String descOrgao, Boolean indValDocObligatorioEmbarcada, Boolean sentido, Integer claseId, String descClase, Boolean indTribTarifa, Boolean indTribTaxaEmbarque, Boolean indTribPedagio){
+		super();
+		this.rutaId = rutaId.longValue();
+		this.numRuta = numRuta;
+		this.prefixo = prefixo;
+		this.descruta = descruta;
+		this.orgaoConcedente = descOrgao;
+		this.orgaoConcedenteVO = new OrgaoConcedenteVO(orgaoConcedenteId, descOrgao, indValDocObligatorioEmbarcada);
+		this.sentido = sentido;
+		this.claseVO = new ClaseVO(claseId, descClase);
+		this.indTribTarifa = indTribTarifa;
+		this.indTribTaxaEmbarque = indTribTaxaEmbarque;
+		this.indTribPedagio = indTribPedagio;
+	}
+	 
 	public Long getRutaId() {
 		return rutaId;
 	}
@@ -117,7 +135,29 @@ public class RutaVO {
 	public void setOrgaoConcedenteVO(OrgaoConcedenteVO orgaoConcedenteVO) {
 		this.orgaoConcedenteVO = orgaoConcedenteVO;
 	}
-	
-	
+
+	public Boolean getIndTribTarifa() {
+		return indTribTarifa;
+	}
+
+	public void setIndTribTarifa(Boolean indTribTarifa) {
+		this.indTribTarifa = indTribTarifa;
+	}
+
+	public Boolean getIndTribTaxaEmbarque() {
+		return indTribTaxaEmbarque;
+	}
+
+	public void setIndTribTaxaEmbarque(Boolean indTribTaxaEmbarque) {
+		this.indTribTaxaEmbarque = indTribTaxaEmbarque;
+	}
+
+	public Boolean getIndTribPedagio() {
+		return indTribPedagio;
+	}
+
+	public void setIndTribPedagio(Boolean indTribPedagio) {
+		this.indTribPedagio = indTribPedagio;
+	}
 	
 }