diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioBPe.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioBPe.java index 970dc32fe..188235a83 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioBPe.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioBPe.java @@ -97,7 +97,7 @@ public class RelatorioBPe extends Relatorio { sql.append(" LEFT JOIN PARADA ori on bol.ORIGEN_ID = ori.PARADA_ID "); sql.append(" LEFT JOIN PARADA dest on bol.DESTINO_ID = dest.PARADA_ID "); - sql.append(" WHERE bol.ACTIVO = 1 and e.ACTIVO = 1 "); + sql.append(" WHERE e.ACTIVO = 1 "); if (empresaId != null) { sql.append(" AND ep.EMPRESA_ID = " + empresaId + " "); @@ -107,17 +107,17 @@ public class RelatorioBPe extends Relatorio { } if (status != null && status.equals("A")) { - sql.append(" AND bpe.CODSTAT = '100' AND bpe.TIPOSUBSTITUICAO IS NULL "); + sql.append(" AND bpe.CODSTAT = '100' AND bpe.TIPOSUBSTITUICAO IS NULL AND bol.ACTIVO = 1 "); } else if (status != null && status.equals("C")) { - sql.append(" AND bpe.CODSTAT = '135' AND bpe.TIPOEVENTO = '110111' "); + sql.append(" AND bpe.CODSTAT = '135' AND bpe.TIPOEVENTO = '110111' AND bol.ACTIVO = 1 "); } else if (status != null && status.equals("S")) { - sql.append(" AND bpe.CODSTAT IN ('100', '102') AND bpe.TIPOSUBSTITUICAO IS NOT NULL "); + sql.append(" AND bpe.CODSTAT IN ('100', '102') AND bpe.TIPOSUBSTITUICAO IS NOT NULL AND bol.ACTIVO = 1 "); } else if (status != null && status.equals("NE")) { - sql.append(" AND bpe.CODSTAT = '135' AND bpe.TIPOEVENTO = '110115' "); + sql.append(" AND bpe.CODSTAT = '135' AND bpe.TIPOEVENTO = '110115' AND bol.ACTIVO = 1 "); } else if (status != null && status.equals("R")) { - sql.append(" AND bpe.CODSTAT NOT IN ('100','135') "); + sql.append(" AND bpe.CODSTAT NOT IN ('100','135','102','150') "); }else if (status != null && status.equals("AA")) { - sql.append(" AND bpe.CODSTAT = '150' AND bpe.TIPOSUBSTITUICAO IS NULL "); + sql.append(" AND bpe.CODSTAT = '150' AND bpe.TIPOSUBSTITUICAO IS NULL AND bol.ACTIVO = 1 "); } sql.append(" AND COALESCE(bpe.DT_VENDA,bol.FECHORVENTA) >= TO_DATE(?,'DD/MM/YYYY HH24:MI:SS') "); diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioBPeController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioBPeController.java index f2a202726..11b310d53 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioBPeController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioBPeController.java @@ -95,7 +95,7 @@ public class RelatorioBPeController extends MyGenericForwardComposer { String estadosIds = ""; String UFs = ""; List lsEstadosSelecionados = estadoList.getSelectedsItens(); - if (lsEstadosSelecionados.size() > 0) { + if (!lsEstadosSelecionados.isEmpty()) { for (int i = 0; i < lsEstadosSelecionados.size(); i++) { Estado estado = (Estado) lsEstadosSelecionados.get(i); UFs = UFs + estado.getCveestado() + ",";