Exportação Fiscal : ECF e RMD (issue 8120)

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Model/trunk/modelWeb@73450 d1611594-4594-4d17-8e1d-87c2c4800839
master
alberto 2017-09-01 20:43:35 +00:00
parent 89001d0037
commit 9623248564
2 changed files with 4 additions and 4 deletions

View File

@ -2508,7 +2508,7 @@ public class FiscalHibernateDAO extends HibernateDaoSupport implements FiscalDAO
registro.setDataEmissaoRMD(sdf.format(rs.getDate("dataEmissaoRMD"))); registro.setDataEmissaoRMD(sdf.format(rs.getDate("dataEmissaoRMD")));
registro.setCodigoParticipante(rs.getInt("codigoParticipante")); registro.setCodigoParticipante(rs.getInt("codigoParticipante"));
registro.setCodigoEstabelecimento(rs.getInt("codigoEstabelecimento")); registro.setCodigoEstabelecimento(rs.getInt("codigoEstabelecimento"));
registro.setNumeroAIDF(String.valueOf(rs.getLong("numeroAIDF"))); registro.setNumeroAIDF(rs.getString("numeroAIDF"));
registro.setSerieAIDF(rs.getString("serieAIDF")); registro.setSerieAIDF(rs.getString("serieAIDF"));
registro.setSubSerieAIDF(rs.getString("subSerieAIDF")); registro.setSubSerieAIDF(rs.getString("subSerieAIDF"));
registro.setNumeroFormularioBilheteAIDF(rs.getLong("numeroFormularioBilheteAIDF")); registro.setNumeroFormularioBilheteAIDF(rs.getLong("numeroFormularioBilheteAIDF"));
@ -2518,7 +2518,7 @@ public class FiscalHibernateDAO extends HibernateDaoSupport implements FiscalDAO
// BPS // BPS
registro.setDataEmissao(rs.getDate("dataEmissao") == null ? null : sdf.format(rs.getDate("dataEmissao"))); registro.setDataEmissao(rs.getDate("dataEmissao") == null ? null : sdf.format(rs.getDate("dataEmissao")));
registro.setNumeroFormulario(rs.getLong("numeroFormulario")); registro.setNumeroFormulario(rs.getLong("numeroFormulario"));
registro.setNumeroAIDFRMD(String.valueOf(rs.getLong("numeroAIDFRMD"))); registro.setNumeroAIDFRMD(rs.getString("numeroAIDFRMD"));
registro.setSerieAIDFRMD(rs.getString("serieAIDFRMD")); registro.setSerieAIDFRMD(rs.getString("serieAIDFRMD"));
registro.setSubSerieAIDFRMD(rs.getString("subSerieAIDFRMD")); registro.setSubSerieAIDFRMD(rs.getString("subSerieAIDFRMD"));
registro.setNumeroRMD(rs.getInt("numeroRMD")); registro.setNumeroRMD(rs.getInt("numeroRMD"));

View File

@ -328,8 +328,8 @@ public class ExportacaoBPR {
Collections.sort(listaRegistroBPRTipoSeqBPS, new Comparator<ExportacaoRMDTipoSeqBPS>(){ Collections.sort(listaRegistroBPRTipoSeqBPS, new Comparator<ExportacaoRMDTipoSeqBPS>(){
public int compare(ExportacaoRMDTipoSeqBPS e1, ExportacaoRMDTipoSeqBPS e2) { public int compare(ExportacaoRMDTipoSeqBPS e1, ExportacaoRMDTipoSeqBPS e2) {
String c1 = e1.getCodigoEstabelecimento() + "-" + e1.getNumeroInicial(); String c1 = e1.getDataEmissao();
String c2 = e2.getCodigoEstabelecimento() + "-" + e2.getNumeroInicial(); String c2 = e2.getDataEmissao();
return c1.compareToIgnoreCase(c2); return c1.compareToIgnoreCase(c2);
} }