From 30699b8f34a595b08059a796ee2f971e13946ea1 Mon Sep 17 00:00:00 2001 From: julio Date: Thu, 31 Aug 2017 14:40:16 +0000 Subject: [PATCH] fixes bug #9608 git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@73368 d1611594-4594-4d17-8e1d-87c2c4800839 --- .../relatorios/impl/RelatorioFolioRmd.java | 36 ++--- .../templates/RelatorioFolioRmd.jasper | Bin 35039 -> 36302 bytes .../templates/RelatorioFolioRmd.jrxml | 131 +++++++++--------- 3 files changed, 86 insertions(+), 81 deletions(-) diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioFolioRmd.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioFolioRmd.java index e60db2269..f2983e3a6 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioFolioRmd.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioFolioRmd.java @@ -4,6 +4,7 @@ import java.sql.Connection; import java.sql.ResultSet; import java.sql.SQLException; import java.util.ArrayList; +import java.util.Collections; import java.util.List; import java.util.Map; @@ -77,6 +78,7 @@ public class RelatorioFolioRmd extends Relatorio { }); + Collections.sort(listdata); this.setCollectionDataSource(new JRBeanCollectionDataSource(listdata)); } @@ -88,25 +90,25 @@ public class RelatorioFolioRmd extends Relatorio { StringBuilder sql = new StringBuilder(); sql.append("select f.folio as foliormd, "); - sql.append(" case when f.indcancelacion = 1 then 'CANCELADO' else 'IMPRESSO' end as status, "); - sql.append(" to_char(f.fechorfolio, 'yyyymmdd') as fechorfolio, "); - sql.append(" e.nombempresa as empresa, "); - sql.append(" eo.cveestado as uf, "); - sql.append(" eo.nombestado as estado, "); - sql.append(" ai.docfiscal as doc, "); - sql.append(" case when f.indecf = 1 then 'ECF' else 'BPR' end as tipo, "); - sql.append(" f.valorcontabil as valorContabil, "); - sql.append(" f.basecalculo as baseCalculo, "); - sql.append(" f.aliquota as aliquota, "); - sql.append(" f.isentos as isentos, "); - sql.append(" f.outros as outros, "); - sql.append(" f.icms as icms "); + sql.append(" case when f.indcancelacion = 1 then 'CANCELADO' else 'IMPRESSO' end as status, "); + sql.append(" to_char(f.fechorfolio, 'yyyymmdd') as fechorfolio, "); + sql.append(" e.nombempresa as empresa, "); + sql.append(" eo.cveestado as uf, "); + sql.append(" eo.nombestado as estado, "); + sql.append(" ai.docfiscal as doc, "); + sql.append(" case when f.indecf = 1 then 'ECF' else 'BPR' end as tipo, "); + sql.append(" f.valorcontabil as valorContabil, "); + sql.append(" f.basecalculo as baseCalculo, "); + sql.append(" f.aliquota as aliquota, "); + sql.append(" f.isentos as isentos, "); + sql.append(" f.outros as outros, "); + sql.append(" f.icms as icms "); sql.append("from folio_consumo_rmd f "); - sql.append("inner join aidf ai on f.rmd_id = ai.aidf_id and ai.aidfesp_id = 3 "); - sql.append("inner join empresa e on e.empresa_id = f.empresa_id "); - sql.append("join estado eo on eo.estado_id = f.estado_id "); + sql.append(" inner join aidf ai on f.rmd_id = ai.aidf_id and ai.aidfesp_id = 3 "); + sql.append(" inner join empresa e on e.empresa_id = f.empresa_id "); + sql.append(" join estado eo on eo.estado_id = f.estado_id "); sql.append("where f.empresa_id = :empresaId and f.rmd_id = :rmdId and f.estado_id = :estadoId "); - sql.append(" and f.indinactivo <> 1 and f.activo = 1 "); + sql.append(" and f.indinactivo <> 1 and f.activo = 1 "); sql.append("order by foliormd "); return sql.toString(); diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioFolioRmd.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioFolioRmd.jasper index 417a93cd87036f41e7833f56b34736c386e65fb2..2a27f535440d181a1eab0101f57f9868feffab48 100644 GIT binary patch literal 36302 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 - + @@ -17,21 +17,76 @@ - + - + - + - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -120,42 +175,42 @@ - + - + - + - + - + - + @@ -250,58 +305,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -