From 8bc7a65e99c8dea693167b3cf1adbd21acd5ff6b Mon Sep 17 00:00:00 2001 From: wilian Date: Fri, 18 Jan 2019 13:08:37 +0000 Subject: [PATCH] fixes bug#13319 dev:fred qua: git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@89043 d1611594-4594-4d17-8e1d-87c2c4800839 --- .../impl/RelatorioIntegracaoAntiFraude.java | 10 ++-- .../RelatorioIntegracaoAntiFraude.jasper | Bin 56473 -> 56485 bytes ...ExecutarRelatorioIntegracaoAntiFraude.java | 50 +++++++++++------- 3 files changed, 36 insertions(+), 24 deletions(-) diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioIntegracaoAntiFraude.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioIntegracaoAntiFraude.java index 499cad1fe..163f00ff7 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioIntegracaoAntiFraude.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioIntegracaoAntiFraude.java @@ -53,7 +53,7 @@ public class RelatorioIntegracaoAntiFraude extends Relatorio { instrucaoSql.append("TK.DESCORIGEM ORIGEM, TK.DESCDESTINO DESTINO, "); instrucaoSql.append("B.NUMFOLIOSISTEMA BILHETE, "); instrucaoSql.append("B.NUMASIENTO POLTRONA, "); - instrucaoSql.append("COALESCE(B.NOMBPASAJERO,CLI.NOMBCLIENTE) PASSAGEIRO, "); + instrucaoSql.append("B.NOMBPASAJERO PASSAGEIRO, "); instrucaoSql.append("TK.STATUSTRANSACAOKONDUTO STATUSTRANSACAOKONDUTO, "); instrucaoSql.append("TK.STATUSTRANSACAO STATUSTRANSACAO, "); instrucaoSql.append("TK.TENTATIVAENVIO TENTATIVAENVIO, "); @@ -71,19 +71,19 @@ public class RelatorioIntegracaoAntiFraude extends Relatorio { instrucaoSql.append("LEFT JOIN CLIENTE CLI ON TK.CLIENTE_ID = CLI.CLIENTE_ID "); instrucaoSql.append("WHERE TK.DATA_VENDA BETWEEN :dtInicial AND :dtFinal "); - if (parametros.get("statusKondutoTotalBusId") != null) { + if (parametros.get("statusKondutoTotalBusId") != null && StringUtils.isNotBlank(parametros.get("statusKondutoTotalBusId").toString())) { instrucaoSql.append("AND TK.STATUSTRANSACAO IN(" + parametros.get("statusKondutoTotalBusId").toString() + ") "); } - if (parametros.get("empresaId") != null && !((String) parametros.get("empresaId")).isEmpty()) { + if (parametros.get("empresaId") != null && StringUtils.isNotBlank(parametros.get("empresaId").toString())) { instrucaoSql.append("AND TK.EMPRESA_ID IN (" + parametros.get("empresaId") + ") "); } - if (parametros.get("puntoventaId") != null && !((String) parametros.get("puntoventaId")).isEmpty()) { + if (parametros.get("puntoventaId") != null && StringUtils.isNotBlank(parametros.get("puntoventaId").toString())) { instrucaoSql.append("AND TK.PUNTOVENTA_ID IN (" + parametros.get("puntoventaId") + ")"); } - if (parametros.get("statusKondutoId") != null) { + if (parametros.get("statusKondutoId") != null && StringUtils.isNotBlank(parametros.get("statusKondutoId").toString())) { instrucaoSql.append("AND (TK.STATUSTRANSACAOKONDUTO IN(" + parametros.get("statusKondutoId").toString() + ") OR TK.STATUSTRANSACAOKONDUTO IS NULL)"); } diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioIntegracaoAntiFraude.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioIntegracaoAntiFraude.jasper index e0e71088fc5f67803338719e25f979ab621a28af..61f0ff586ef96f4df35cba784179d38e8cb63883 100644 GIT binary patch delta 6993 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 bEK3VWYkD4e`%1>h?n`$|vkgTgdAIa`n?8f% diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/integracaoantifraude/EventListenerExecutarRelatorioIntegracaoAntiFraude.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/integracaoantifraude/EventListenerExecutarRelatorioIntegracaoAntiFraude.java index d6c348638..c14d60db9 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/integracaoantifraude/EventListenerExecutarRelatorioIntegracaoAntiFraude.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/integracaoantifraude/EventListenerExecutarRelatorioIntegracaoAntiFraude.java @@ -50,39 +50,51 @@ public class EventListenerExecutarRelatorioIntegracaoAntiFraude extends EventLis parametros.put("dtFinal", getController().getDtFinal().getValue()); parametros.put("periodo", obtemPeriodo()); - String empresaIds = ""; - String empresas = ""; - + StringBuilder empresaIds = new StringBuilder(); + StringBuilder empresas = new StringBuilder(); List lsEmpresasSelecionadas = new ArrayList(Arrays.asList(getController().getEmpresaSelList().getData())); if (lsEmpresasSelecionadas.size() > 0) { for (int i = 0; i < lsEmpresasSelecionadas.size(); i++) { Empresa empresa = lsEmpresasSelecionadas.get(i); - empresas += empresa.getNombempresa() + ","; - empresaIds += empresa.getEmpresaId() + ","; + if(empresa != null) { + if(empresaIds.length() > 0) { + empresaIds.append(","); + } + empresaIds.append(empresa.getEmpresaId()); + + if(empresas.length() > 0) { + empresas.append(","); + } + empresas.append(empresa.getNombempresa()); + } } - - empresaIds = empresaIds.substring(0, empresaIds.length() - 1); - empresas = empresas.substring(0, empresas.length() - 1); - parametros.put("empresaId", empresaIds); - parametros.put("empresa", empresas); + parametros.put("empresaId", empresaIds.toString()); + parametros.put("empresa", empresas.toString()); } else { parametros.put("empresa", "Todas"); } - String puntoVentaIds = ""; - String puntoVentas = ""; + StringBuilder puntoVentaIds = new StringBuilder(); + StringBuilder puntoVentas = new StringBuilder(); List lsPuntoVentaSelecionados = new ArrayList(Arrays.asList(getController().getPuntoVentaSelList().getData())); if (lsPuntoVentaSelecionados.size() > 0) { for (int i = 0; i < lsPuntoVentaSelecionados.size(); i++) { PuntoVenta puntoVenta = lsPuntoVentaSelecionados.get(i); - puntoVentas = puntoVentas + puntoVenta.getNombpuntoventa() + ","; - puntoVentaIds = puntoVentaIds + puntoVenta.getPuntoventaId() + ","; + if(puntoVenta != null) { + if(puntoVentaIds.length() > 0) { + puntoVentaIds.append(","); + } + puntoVentaIds.append(puntoVenta.getPuntoventaId()); + + if(puntoVentas.length() > 0) { + puntoVentas.append(","); + } + puntoVentas.append(puntoVenta.getPuntoventaId()); + puntoVentas = puntoVentas.append(puntoVenta.getNombpuntoventa()); + } } - - puntoVentaIds = puntoVentaIds.substring(0, puntoVentaIds.length() - 1); - puntoVentas = puntoVentas.substring(0, puntoVentas.length() - 1); - parametros.put("puntoventaId", puntoVentaIds); - parametros.put("puntoventa", puntoVentas); + parametros.put("puntoventaId", puntoVentaIds.toString()); + parametros.put("puntoventa", puntoVentas.toString()); } else { parametros.put("puntoventa", "Todas"); }