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

fixes bug #7906 

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@61226 d1611594-4594-4d17-8e1d-87c2c4800839
master
eduardo.dicarde 2016-10-05 20:05:10 +00:00
parent 2073094723
commit 371654287c
1 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioObservacaoConferenciaMovimento.java
View File

@ -26,7 +26,10 @@ public class RelatorioObservacaoConferenciaMovimento extends Relatorio {
private Date dataInicial; private Date dataInicial;
private Date dataFinal; private Date dataFinal;
private Boolean pendencia; private Boolean pendencia;
private Boolean taxaEmbarque;
private Boolean credito;
private Boolean outros;
public RelatorioObservacaoConferenciaMovimento(Map<String, Object> parametros, Connection conexao) throws Exception { public RelatorioObservacaoConferenciaMovimento(Map<String, Object> parametros, Connection conexao) throws Exception {
super(parametros, conexao); super(parametros, conexao);
@ -59,7 +62,13 @@ public class RelatorioObservacaoConferenciaMovimento extends Relatorio {
.append("LEFT JOIN TIPO_EVENTO_EXTRA TEE ON TEE.TIPOEVENTOEXTRA_ID = EE.TIPOEVENTOEXTRA_ID ") .append("LEFT JOIN TIPO_EVENTO_EXTRA TEE ON TEE.TIPOEVENTOEXTRA_ID = EE.TIPOEVENTOEXTRA_ID ")
.append("WHERE LOG.ACTIVO = 1 ") .append("WHERE LOG.ACTIVO = 1 ")
.append("AND C.DATAMOVIMENTO BETWEEN :dataInicial AND :dataFinal ") .append("AND C.DATAMOVIMENTO BETWEEN :dataInicial AND :dataFinal ")
.append("AND LOG.STATUS = :pendencia "); .append("AND LOG.STATUS = :pendencia ")
.append("AND B.IMPORTETAXAEMBARQUE = :taxaEmbarque ")
.append("AND B.IMPORTEOUTROS = :outros ");
if (credito != null){
sQuery.append("AND LOG.INDCREDITO = :credito ");
}
if(empresaId != null) { if(empresaId != null) {
sQuery.append("AND C.EMPRESA_ID = :empresaId "); sQuery.append("AND C.EMPRESA_ID = :empresaId ");
@ -84,6 +93,12 @@ public class RelatorioObservacaoConferenciaMovimento extends Relatorio {
stmt.setDate("dataInicial", new java.sql.Date(dataInicial.getTime())); stmt.setDate("dataInicial", new java.sql.Date(dataInicial.getTime()));
stmt.setDate("dataFinal", new java.sql.Date(dataFinal.getTime())); stmt.setDate("dataFinal", new java.sql.Date(dataFinal.getTime()));
stmt.setBoolean("pendencia", pendencia); stmt.setBoolean("pendencia", pendencia);
stmt.setBoolean("taxaEmbarque", taxaEmbarque);
stmt.setBoolean("outros", outros);
if (credito != null){
stmt.setBoolean("credito", credito);
}
rset = stmt.executeQuery(); rset = stmt.executeQuery();
@ -139,6 +154,9 @@ public class RelatorioObservacaoConferenciaMovimento extends Relatorio {
this.dataInicial = (Date) parametros.get("dataFiltroInicial"); this.dataInicial = (Date) parametros.get("dataFiltroInicial");
this.dataFinal = (Date) parametros.get("dataFiltroFinal"); this.dataFinal = (Date) parametros.get("dataFiltroFinal");
this.pendencia = (Boolean) parametros.get("pendencia"); this.pendencia = (Boolean) parametros.get("pendencia");
this.taxaEmbarque = (Boolean) parametros.get("taxaEmbarque");
this.outros = (Boolean) parametros.get("outros");
this.credito = (Boolean) parametros.get("credito");
if(empresaId != null) { if(empresaId != null) {
this.empresaId = empresaId; this.empresaId = empresaId;