fabio
/
AdmMono
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bug#10939 

dev:wallace
qua:flavio

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@81637 d1611594-4594-4d17-8e1d-87c2c4800839
master
julio 2018-05-07 12:59:42 +00:00
parent 8121fd937b
commit d337b22405
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioFolioRmd.java
View File

@ -5,6 +5,7 @@ import java.sql.ResultSet;
import java.sql.SQLException;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Date;
import java.util.List;
import java.util.Map;
@ -38,11 +39,16 @@ public class RelatorioFolioRmd extends Relatorio {
Empresa empresa = (Empresa) parametros.get("empresa");
Estado estado = (Estado) parametros.get("estado");
Aidf aidf = (Aidf) parametros.get("aidf");
Date dataInicial = (Date) parametros.get("dataInicial");
Date dataFinal = (Date) parametros.get("dataFinal");
NamedParameterStatement stmt = new NamedParameterStatement(getConexao(), getSqlRMDReporte());
stmt.setInt("empresaId", empresa.getEmpresaId());
stmt.setInt("estadoId", estado.getEstadoId());
stmt.setLong("rmdId", aidf.getAidfId());
stmt.setDate("dataInicial", new java.sql.Date (dataInicial.getTime()));
stmt.setDate("dataFinal", new java.sql.Date (dataFinal.getTime()));
ResultSet rset = stmt.executeQuery();
listdata = new ArrayList<FolioRMD>();
@ -78,7 +84,6 @@ public class RelatorioFolioRmd extends Relatorio {
});
Collections.sort(listdata);
this.setCollectionDataSource(new JRBeanCollectionDataSource(listdata));
}
@ -91,7 +96,7 @@ 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(" case when f.indcancelacion = 1 then to_char(f.fecmodif, 'yyyymmdd') else to_char(f.fechorfolio, 'yyyymmdd') end as fechorfolio, ");
sql.append(" e.nombempresa as empresa, ");
sql.append(" eo.cveestado as uf, ");
sql.append(" eo.nombestado as estado, ");
@ -108,8 +113,9 @@ public class RelatorioFolioRmd extends Relatorio {
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.fechorfolio between :dataInicial and :dataFinal ");
sql.append(" and f.indinactivo <> 1 and f.activo = 1 ");
sql.append("order by foliormd ");
sql.append("order by tipo, estado, to_number(foliormd) ");
return sql.toString();
}

2
src/java/com/rjconsultores/ventaboletos/web/gui/controladores/impressaofiscal/BusquedaImpressaoRMDController.java
View File

@ -258,6 +258,8 @@ public class BusquedaImpressaoRMDController extends MyGenericForwardComposer {
parametros.put("empresa", empresa);
parametros.put("estado", estado);
parametros.put("aidf", aidf);
parametros.put("dataInicial", datInicial.getValue());
parametros.put("dataFinal", datFinal.getValue());
Relatorio relatorio = new RelatorioFolioRmd(parametros, dataSourceRead.getConnection());