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 417a93cd8..2a27f5354 100644 Binary files a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioFolioRmd.jasper and b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioFolioRmd.jasper differ diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioFolioRmd.jrxml b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioFolioRmd.jrxml index 6c2a36493..952ff283b 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioFolioRmd.jrxml +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioFolioRmd.jrxml @@ -1,7 +1,7 @@ - + @@ -17,21 +17,76 @@ - + - + - + - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -120,42 +175,42 @@ - + - + - + - + - + - + @@ -250,58 +305,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -