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

fixes bug#18920 

dev:thiago
qua:

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@101098 d1611594-4594-4d17-8e1d-87c2c4800839
master
wilian 2020-04-03 21:36:22 +00:00
parent f581d9a9cd
commit feb61bfb9b
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioBPe.java
View File

@ -152,7 +152,7 @@ public class RelatorioBPe extends Relatorio {
sql.append(" bpe.QRCODE, bpe.errocontingencia "); sql.append(" bpe.QRCODE, bpe.errocontingencia ");
sql.append(" FROM BPE bpe "); sql.append(" FROM BPE bpe ");
sql.append(" LEFT JOIN BPE bpeSub ON bpe.CHBPE_SUBSTITUICAO = bpeSub.CHBPE AND bpeSub.activo = 1 "); sql.append(" LEFT JOIN BPE bpeSub ON bpe.BPESUBSTITUICAO_ID = bpeSub.BPE_ID AND bpeSub.activo = 1 ");
sql.append(" LEFT JOIN BOLETO bol ON bol.BOLETO_ID = bpe.BOLETO_ID and bpe.activo = 1 "); sql.append(" LEFT JOIN BOLETO bol ON bol.BOLETO_ID = bpe.BOLETO_ID and bpe.activo = 1 ");
sql.append(" LEFT JOIN estado e ON e.CODIBGE = bpe.UF "); sql.append(" LEFT JOIN estado e ON e.CODIBGE = bpe.UF ");
sql.append(" LEFT JOIN marca ma ON bol.MARCA_ID = ma.MARCA_ID "); sql.append(" LEFT JOIN marca ma ON bol.MARCA_ID = ma.MARCA_ID ");
@ -206,8 +206,8 @@ public class RelatorioBPe extends Relatorio {
// sql.append(" AND COALESCE(bpe.DT_VENDA,bol.FECHORVENTA) >= TO_DATE(:dataInicio,'DD/MM/YYYY HH24:MI:SS') "); // sql.append(" AND COALESCE(bpe.DT_VENDA,bol.FECHORVENTA) >= TO_DATE(:dataInicio,'DD/MM/YYYY HH24:MI:SS') ");
// sql.append(" AND COALESCE(bpe.DT_VENDA,bol.FECHORVENTA) <= TO_DATE(:dataFinal,'DD/MM/YYYY HH24:MI:SS') "); // sql.append(" AND COALESCE(bpe.DT_VENDA,bol.FECHORVENTA) <= TO_DATE(:dataFinal,'DD/MM/YYYY HH24:MI:SS') ");
//Mantis 17952 //Mantis 17952
sql.append(" AND (bpe.dt_venda >= TO_DATE(:dataInicio, 'DD/MM/YYYY HH24:MI:SS' ) OR bpe.dt_venda is null and bol.fechorventa >= TO_DATE(:dataInicio, 'DD/MM/YYYY HH24:MI:SS')) "); sql.append(" AND (bpe.dt_venda >= TO_DATE(:dataInicio, 'DD/MM/YYYY HH24:MI:SS' ) OR (bpe.dt_venda is null and bol.fechorventa >= TO_DATE(:dataInicio, 'DD/MM/YYYY HH24:MI:SS'))) ");
sql.append(" AND (bpe.dt_venda <= TO_DATE(:dataFinal, 'DD/MM/YYYY HH24:MI:SS' ) OR bpe.dt_venda is null and bol.fechorventa <= TO_DATE(:dataFinal, 'DD/MM/YYYY HH24:MI:SS' ))"); sql.append(" AND (bpe.dt_venda <= TO_DATE(:dataFinal, 'DD/MM/YYYY HH24:MI:SS' ) OR (bpe.dt_venda is null and bol.fechorventa <= TO_DATE(:dataFinal, 'DD/MM/YYYY HH24:MI:SS' )))");
} }
} }