issue #8301
git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@64681 d1611594-4594-4d17-8e1d-87c2c4800839master
parent
3ddfd71bc6
commit
7067c3ea47
|
@ -31,11 +31,11 @@ public class RelatorioTabelaPreco extends Relatorio {
|
||||||
String series = RelatorioTabelaPreco.this.segVKMService.seriePorEmpresa((Integer) parametros.get("EMPRESA_ID"));
|
String series = RelatorioTabelaPreco.this.segVKMService.seriePorEmpresa((Integer) parametros.get("EMPRESA_ID"));
|
||||||
while (rset.next()) {
|
while (rset.next()) {
|
||||||
Map<String, Object> dataResult = new HashMap<String, Object>();
|
Map<String, Object> dataResult = new HashMap<String, Object>();
|
||||||
BigDecimal valorSegOpcional = BigDecimal.ZERO;
|
|
||||||
|
|
||||||
if (isLayoutArtesp) {
|
if (isLayoutArtesp) {
|
||||||
valorSegOpcional = RelatorioTabelaPreco.this.segVKMService.buscarSeguroPorKm(rset.getLong("kmReal"),
|
dataResult.put("seguroOpcional",
|
||||||
series, (Integer) parametros.get("ORGAO_CONCEDENTE_ID"));
|
RelatorioTabelaPreco.this.segVKMService.buscarSeguroPorKm(rset.getLong("kmReal"),
|
||||||
|
series, (Integer) parametros.get("ORGAO_CONCEDENTE_ID")));
|
||||||
}
|
}
|
||||||
|
|
||||||
dataResult.put("origem", rset.getString("origem"));
|
dataResult.put("origem", rset.getString("origem"));
|
||||||
|
@ -43,7 +43,7 @@ public class RelatorioTabelaPreco extends Relatorio {
|
||||||
dataResult.put("tarifa", rset.getBigDecimal("tarifa"));
|
dataResult.put("tarifa", rset.getBigDecimal("tarifa"));
|
||||||
dataResult.put("pedagio", rset.getBigDecimal("pedagio"));
|
dataResult.put("pedagio", rset.getBigDecimal("pedagio"));
|
||||||
dataResult.put("taxaEmbarque", rset.getBigDecimal("taxaEmbarque"));
|
dataResult.put("taxaEmbarque", rset.getBigDecimal("taxaEmbarque"));
|
||||||
dataResult.put("seguroOpcional", valorSegOpcional);
|
|
||||||
dataResult.put("outros", rset.getBigDecimal("outros"));
|
dataResult.put("outros", rset.getBigDecimal("outros"));
|
||||||
dataResult.put("tipoClasse", rset.getString("tipoClasse"));
|
dataResult.put("tipoClasse", rset.getString("tipoClasse"));
|
||||||
dataResult.put("empresa", rset.getString("empresa"));
|
dataResult.put("empresa", rset.getString("empresa"));
|
||||||
|
|
Loading…
Reference in New Issue