From 25282a15abfc737289156e31763312b0f03947fb Mon Sep 17 00:00:00 2001
From: emerson <emerson@d1611594-4594-4d17-8e1d-87c2c4800839>
Date: Mon, 18 Jun 2018 17:36:53 +0000
Subject: [PATCH] fixes bug#0011341 dev: julio qua: renato.oliveira

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@82717 d1611594-4594-4d17-8e1d-87c2c4800839
---
 .../RelatorioBilhetesVendidosNovoLayout.java  | 26 ++++++++++++-------
 1 file changed, 17 insertions(+), 9 deletions(-)

diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioBilhetesVendidosNovoLayout.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioBilhetesVendidosNovoLayout.java
index a74251448..15378509b 100644
--- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioBilhetesVendidosNovoLayout.java
+++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioBilhetesVendidosNovoLayout.java
@@ -7,6 +7,7 @@ import java.math.BigDecimal;
 import java.math.RoundingMode;
 import java.sql.Connection;
 import java.sql.ResultSet;
+import java.sql.SQLException;
 import java.text.DecimalFormat;
 import java.util.ArrayList;
 import java.util.Date;
@@ -145,16 +146,16 @@ public class RelatorioBilhetesVendidosNovoLayout extends Relatorio {
 						dataResult.put("statuspassagem", IndStatusBoleto.valueOf(rset.getString("statuspassagem")).getValue());
 					}
 					bean.setDataVenda(rset.getString("datavenda") != null ? DateUtil.changeFormatStringDate(rset.getString("datavenda"),"dd/MM/yy", "dd/MM/yyyy") : "");	
-					bean.setFormInicial((String) (rset.getObject("formInicial") == null ? "" : rset.getObject("formInicial")));
-					bean.setFormFinal((String) (rset.getObject("formfinal") == null ? "" : rset.getObject("formfinal")));
-					bean.setSerie((String) (rset.getObject("serie") == null ? "" : rset.getObject("serie")));
-					bean.setValorContabil((BigDecimal) (rset.getObject("valorcontabil") == null ? "" : rset.getObject("valorcontabil")));
-					bean.setValorBaseCalculo((BigDecimal) (rset.getObject("valorbasecalculo") == null ? "" : rset.getObject("valorbasecalculo")));
-					bean.setValorAliquiotaICMS((BigDecimal) (rset.getObject("valoraliquiotaicms") == null ? "" :  rset.getObject("valoraliquiotaicms")));
-					bean.setValorICMS((BigDecimal) (rset.getObject("valoricms") == null ? "" : rset.getObject("valoricms")));
-					bean.setUf((String) (rset.getObject("cveestado") == null ? "" : rset.getObject("cveestado")));
+					bean.setFormInicial(StringUtils.defaultString(rset.getString("formInicial")));
+					bean.setFormFinal(StringUtils.defaultString(rset.getString("formfinal")));
+					bean.setSerie(StringUtils.defaultString(rset.getString("serie")));
+					bean.setValorContabil(getValor("valorcontabil", rset));
+					bean.setValorBaseCalculo(getValor("valorbasecalculo", rset));
+					bean.setValorAliquiotaICMS(getValor("valoraliquiotaicms", rset));
+					bean.setValorICMS(getValor("valoricms", rset));
+					bean.setUf(StringUtils.defaultString(rset.getString("cveestado")));
 					bean.setStatusPassagem((String) (rset.getObject("statuspassagem") != null && rset.getObject("statuspassagem").equals("V") ? "N" : rset.getString("statuspassagem")));
-					bean.setEspecie((String) (rset.getObject("especie") == null ? "" : rset.getObject("especie")));
+					bean.setEspecie(StringUtils.defaultString(rset.getString("especie")));
 					bean.setCodFiscal("5357"); // código fixo indicado pelo cliente mantis 10516
 					bean.setCodOrigem(StringUtils.defaultString(rset.getString("cod_origem")));
 					bean.setOrigem(StringUtils.defaultString(rset.getString("origem")));
@@ -172,6 +173,13 @@ public class RelatorioBilhetesVendidosNovoLayout extends Relatorio {
 		});
 	}
 
+	private BigDecimal getValor(String campo, ResultSet resultSet) throws SQLException {
+		if (resultSet.getObject(campo) == null) {
+			return BigDecimal.ZERO;
+		}
+		return new BigDecimal(resultSet.getString(campo));
+	}
+
 	public void setLsDadosRelatorio(List<RelatorioBilhetesVendidosNovoLayoutBean> lsDadosRelatorio) {
 		this.setCollectionDataSource(new JRBeanCollectionDataSource(lsDadosRelatorio));
 		this.lsDadosRelatorio = lsDadosRelatorio;