From feb61bfb9b20aab8800e5dab6b03c688f4984d54 Mon Sep 17 00:00:00 2001 From: wilian Date: Fri, 3 Apr 2020 21:36:22 +0000 Subject: [PATCH] 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 --- .../ventaboletos/relatorios/impl/RelatorioBPe.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioBPe.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioBPe.java index a9fefed85..201c492a3 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioBPe.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioBPe.java @@ -152,7 +152,7 @@ public class RelatorioBPe extends Relatorio { sql.append(" bpe.QRCODE, bpe.errocontingencia "); 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 estado e ON e.CODIBGE = bpe.UF "); 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(:dataFinal,'DD/MM/YYYY HH24:MI:SS') "); //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(: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(: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' )))"); } }