From 96232485640f569f6ff6d78dce435bc626727c23 Mon Sep 17 00:00:00 2001 From: alberto Date: Fri, 1 Sep 2017 20:43:35 +0000 Subject: [PATCH] =?UTF-8?q?Exporta=C3=A7=C3=A3o=20Fiscal=20:=20ECF=20e=20R?= =?UTF-8?q?MD=20(issue=208120)?= 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@73450 d1611594-4594-4d17-8e1d-87c2c4800839 --- .../ventaboletos/dao/hibernate/FiscalHibernateDAO.java | 4 ++-- .../utilerias/exportacaofiscal/vo/ExportacaoBPR.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/FiscalHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/FiscalHibernateDAO.java index c38b12f41..9a7fc2c74 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/FiscalHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/FiscalHibernateDAO.java @@ -2508,7 +2508,7 @@ public class FiscalHibernateDAO extends HibernateDaoSupport implements FiscalDAO registro.setDataEmissaoRMD(sdf.format(rs.getDate("dataEmissaoRMD"))); registro.setCodigoParticipante(rs.getInt("codigoParticipante")); registro.setCodigoEstabelecimento(rs.getInt("codigoEstabelecimento")); - registro.setNumeroAIDF(String.valueOf(rs.getLong("numeroAIDF"))); + registro.setNumeroAIDF(rs.getString("numeroAIDF")); registro.setSerieAIDF(rs.getString("serieAIDF")); registro.setSubSerieAIDF(rs.getString("subSerieAIDF")); registro.setNumeroFormularioBilheteAIDF(rs.getLong("numeroFormularioBilheteAIDF")); @@ -2518,7 +2518,7 @@ public class FiscalHibernateDAO extends HibernateDaoSupport implements FiscalDAO // BPS registro.setDataEmissao(rs.getDate("dataEmissao") == null ? null : sdf.format(rs.getDate("dataEmissao"))); registro.setNumeroFormulario(rs.getLong("numeroFormulario")); - registro.setNumeroAIDFRMD(String.valueOf(rs.getLong("numeroAIDFRMD"))); + registro.setNumeroAIDFRMD(rs.getString("numeroAIDFRMD")); registro.setSerieAIDFRMD(rs.getString("serieAIDFRMD")); registro.setSubSerieAIDFRMD(rs.getString("subSerieAIDFRMD")); registro.setNumeroRMD(rs.getInt("numeroRMD")); diff --git a/src/com/rjconsultores/ventaboletos/utilerias/exportacaofiscal/vo/ExportacaoBPR.java b/src/com/rjconsultores/ventaboletos/utilerias/exportacaofiscal/vo/ExportacaoBPR.java index 69fbeea8b..161b3f6fc 100644 --- a/src/com/rjconsultores/ventaboletos/utilerias/exportacaofiscal/vo/ExportacaoBPR.java +++ b/src/com/rjconsultores/ventaboletos/utilerias/exportacaofiscal/vo/ExportacaoBPR.java @@ -328,8 +328,8 @@ public class ExportacaoBPR { Collections.sort(listaRegistroBPRTipoSeqBPS, new Comparator(){ public int compare(ExportacaoRMDTipoSeqBPS e1, ExportacaoRMDTipoSeqBPS e2) { - String c1 = e1.getCodigoEstabelecimento() + "-" + e1.getNumeroInicial(); - String c2 = e2.getCodigoEstabelecimento() + "-" + e2.getNumeroInicial(); + String c1 = e1.getDataEmissao(); + String c2 = e2.getDataEmissao(); return c1.compareToIgnoreCase(c2); }