From 66ea9cacccfd3ab35028fa98d4da48ea09c34e50 Mon Sep 17 00:00:00 2001 From: "gleison.cruz" Date: Fri, 17 May 2024 09:17:31 -0300 Subject: [PATCH 1/6] fixes bug#AL-4360 --- pom.xml | 2 +- .../impl/RelatorioResumoLinhasAnaliticoSumarizado.java | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 52fa8fa76..703b112f2 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 br.com.rjconsultores ventaboletosadm - 1.76.2 + 1.76.3 war diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioResumoLinhasAnaliticoSumarizado.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioResumoLinhasAnaliticoSumarizado.java index 8d50b39c2..696192ae0 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioResumoLinhasAnaliticoSumarizado.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioResumoLinhasAnaliticoSumarizado.java @@ -143,10 +143,14 @@ public class RelatorioResumoLinhasAnaliticoSumarizado extends Relatorio { sqlSb.append(" BO.PRECIOBASE, "); sqlSb.append(" ROUND((BO.NUMKMVIAJE * COUNT(1) / "); sqlSb.append(" (SELECT SUM(NVL(TR.CANTKMREAL,0)) "); - sqlSb.append(" FROM RUTA_COMBINACION RS, "); + if (parametros.get("SOMAR_KM_RODADOS_POR").equals("SEQUENCIA")) { + sqlSb.append(" FROM RUTA_SECUENCIA RS, "); + }else { + sqlSb.append(" FROM RUTA_COMBINACION RS, "); + } sqlSb.append(" TRAMO TR "); sqlSb.append(" WHERE RS.RUTA_ID = CO.RUTA_ID "); - sqlSb.append(" AND RS.TRAMO_ID = TR.TRAMO_ID "); + sqlSb.append(" AND RS.TRAMO_ID = TR.TRAMO_ID AND RS.ACTIVO = 1 "); sqlSb.append(" )), 2) EQUIVALENTE "); sqlSb.append(" FROM CORRIDA CO, "); sqlSb.append(" BOLETO BO "); From 3d4491fd27ea9ecf3fd301e141572be327be65d6 Mon Sep 17 00:00:00 2001 From: "celio.souza" Date: Fri, 17 May 2024 22:11:50 -0300 Subject: [PATCH 2/6] ixes bug#AL-4128 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index a8425b0e8..81bac5f8f 100644 --- a/pom.xml +++ b/pom.xml @@ -8,7 +8,7 @@ war - 1.58.0 + 1.58.1 1.43.0 UTF-8 From 2d893a8942945e4f8bc4d29007c192e3d09982d6 Mon Sep 17 00:00:00 2001 From: "celio.souza" Date: Fri, 17 May 2024 22:14:52 -0300 Subject: [PATCH 3/6] fixes bug#AL-4128 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 81bac5f8f..970f5961e 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 br.com.rjconsultores ventaboletosadm - 1.77.1 + 1.77.2 war From 00f50ecdd6330e2f940b20ce3c3cd21d5f47dd8a Mon Sep 17 00:00:00 2001 From: Gleimar Botelho Baleeiro Date: Mon, 20 May 2024 15:09:47 -0300 Subject: [PATCH 4/6] =?UTF-8?q?Corre=C3=A7=C3=A3o.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 4 ++-- .../ventaboletos/web/utilerias/MyAppInit.java | 8 ++++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index 970f5961e..cc6aa27d8 100644 --- a/pom.xml +++ b/pom.xml @@ -4,11 +4,11 @@ 4.0.0 br.com.rjconsultores ventaboletosadm - 1.77.2 + 1.77.3 war - 1.58.1 + 1.58.2 1.43.0 UTF-8 diff --git a/src/java/com/rjconsultores/ventaboletos/web/utilerias/MyAppInit.java b/src/java/com/rjconsultores/ventaboletos/web/utilerias/MyAppInit.java index 9221c0ff9..3749f9bdf 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/utilerias/MyAppInit.java +++ b/src/java/com/rjconsultores/ventaboletos/web/utilerias/MyAppInit.java @@ -180,10 +180,14 @@ public class MyAppInit implements org.zkoss.zk.ui.util.WebAppInit { if (StringUtils.isNotBlank(ipConstanteExclusivo)){ if (lsIps.contains(ipConstanteExclusivo)) { - log.info(" IP Não bloqueado. Liberado exclusivamente. "); + log.info(" IP Não bloqueado. Liberado exclusivamente. "); return false; - } + }else{ + log.info(" IP bloqueado. Não é o ip exclusivamente liberado. "); + + return true; + } } if (StringUtils.isNotBlank(ipConstanteExcepcion)){ From ca614860ca25dd056cf9ea49b4c123abd1516bd5 Mon Sep 17 00:00:00 2001 From: "gleison.cruz" Date: Mon, 20 May 2024 17:30:34 -0300 Subject: [PATCH 5/6] fixes bug#AL-4360 --- pom.xml | 2 +- .../impl/RelatorioResumoLinhasAnalitico.java | 24 ++++++++++++++----- 2 files changed, 19 insertions(+), 7 deletions(-) diff --git a/pom.xml b/pom.xml index cc6aa27d8..69a92b2ce 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 br.com.rjconsultores ventaboletosadm - 1.77.3 + 1.77.4 war diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioResumoLinhasAnalitico.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioResumoLinhasAnalitico.java index a924101c9..b2c87ab66 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioResumoLinhasAnalitico.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioResumoLinhasAnalitico.java @@ -161,23 +161,34 @@ public class RelatorioResumoLinhasAnalitico extends Relatorio { sqlSb.append(" ((NVL(TAB1.VIAGENS,0) + NVL(TAB1.VIAGENS_EXTRA,0)) * NVL(TAB1.EXTENSAO_KM,0)) KM_RODADO, "); sqlSb.append(" TAB1.KM_REAL PAX_KM, "); sqlSb.append(" (SELECT SUM(NVL(PE.EQUIVALENTE,0)) "); - sqlSb.append(" FROM (SELECT CO.FECCORRIDA, CO.RUTA_ID, BO.PRECIOBASE, ROUND((BO.NUMKMVIAJE * COUNT(1) / "); + sqlSb.append(" FROM (SELECT CO.FECCORRIDA, CO.RUTA_ID, BO.PRECIOBASE, CO.CORRIDA_ID, ROUND((BO.NUMKMVIAJE * COUNT(1) / "); if (parametros.get("SOMAR_KM_RODADOS_POR").equals("SEQUENCIA")) { - sqlSb.append(" (SELECT SUM(NVL(TR.CANTKMREAL,0)) FROM RUTA_SECUENCIA RS, TRAMO TR WHERE RS.RUTA_ID = CO.RUTA_ID AND RS.TRAMO_ID = TR.TRAMO_ID AND RS.ACTIVO = 1)), 2) EQUIVALENTE "); + sqlSb.append(" (SELECT SUM(NVL(TR.CANTKMREAL,0)) "); + sqlSb.append(" FROM RUTA_SECUENCIA RS, TRAMO TR "); + sqlSb.append(" WHERE RS.RUTA_ID = TAB1.RUTA_ID "); + sqlSb.append(" AND RS.TRAMO_ID = TR.TRAMO_ID "); + sqlSb.append(" AND RS.ACTIVO = 1 )), 2) EQUIVALENTE "); }else { - sqlSb.append(" (SELECT SUM(NVL(TR.CANTKMREAL,0)) FROM RUTA_COMBINACION RS, TRAMO TR WHERE RS.RUTA_ID = CO.RUTA_ID AND RS.TRAMO_ID = TR.TRAMO_ID AND RS.ACTIVO = 1)), 2) EQUIVALENTE "); + sqlSb.append(" (SELECT SUM(NVL(TR.CANTKMREAL,0)) "); + sqlSb.append(" FROM RUTA_COMBINACION RS, TRAMO TR "); + sqlSb.append(" WHERE RS.RUTA_ID = TAB1.RUTA_ID "); + sqlSb.append(" AND RS.TRAMO_ID = TR.TRAMO_ID "); + sqlSb.append(" AND RS.ACTIVO = 1)), 2) EQUIVALENTE "); } sqlSb.append(" FROM CORRIDA CO, BOLETO BO "); sqlSb.append(" WHERE CO.CORRIDA_ID = BO.CORRIDA_ID "); sqlSb.append(" AND CO.FECCORRIDA = BO.FECCORRIDA "); sqlSb.append(" AND BO.ACTIVO = 1 "); sqlSb.append(" AND (BO.MOTIVOCANCELACION_ID IS NULL OR BO.MOTIVOCANCELACION_ID = 0 AND BO.CATEGORIA_ID <> :CRIANCA_ID) "); - sqlSb.append(" GROUP BY CO.FECCORRIDA, CO.RUTA_ID, BO.PRECIOBASE, BO.NUMKMVIAJE) PE "); - sqlSb.append(" WHERE PE.FECCORRIDA = TAB1.FECCORRIDA AND PE.RUTA_ID = TAB1.RUTA_ID) PASSAGEIROS_EQUIVALENTE "); + sqlSb.append(" GROUP BY CO.FECCORRIDA, CO.RUTA_ID, BO.PRECIOBASE, BO.NUMKMVIAJE, CO.CORRIDA_ID) PE "); + sqlSb.append(" WHERE PE.FECCORRIDA = TAB1.FECCORRIDA "); + sqlSb.append(" AND PE.CORRIDA_ID = TAB1.CORRIDA_ID "); + sqlSb.append(" AND PE.RUTA_ID = TAB1.RUTA_ID) PASSAGEIROS_EQUIVALENTE "); sqlSb.append(" FROM (SELECT RT.RUTA_ID, "); sqlSb.append(" RT.INDSENTIDOIDA, "); sqlSb.append(" RT.NUMRUTA, "); sqlSb.append(" CR.FECCORRIDA, "); + sqlSb.append(" CR.CORRIDA_ID, "); sqlSb.append(" CONCAT(RT.DESCRUTA, CASE WHEN RT.INDSENTIDOIDA = 0 THEN ' - VOLTA' ELSE ' - IDA' END) DESCRUTA, "); sqlSb.append(" TF.PRECIO TARIFA, "); sqlSb.append(" DA.CANTASIENTOS ASSENTOS, "); @@ -266,6 +277,7 @@ public class RelatorioResumoLinhasAnalitico extends Relatorio { sqlSb.append(" RT.RUTA_ID, "); sqlSb.append(" RT.NUMRUTA, "); sqlSb.append(" CR.FECCORRIDA, "); + sqlSb.append(" CR.CORRIDA_ID, "); sqlSb.append(" RT.DESCRUTA, "); sqlSb.append(" TF.PRECIO, "); sqlSb.append(" DA.CANTASIENTOS, "); @@ -279,7 +291,7 @@ public class RelatorioResumoLinhasAnalitico extends Relatorio { sqlSb.append(" TAB1.TARIFA,TAB1.ASSENTOS,TAB1.ROLOPERATIVO_ID,TAB1.INTERESTADUAL, "); sqlSb.append(" TAB1.GRUPO_LINHA,TAB1.EXTENSAO_KM,TAB1.RECEITA_SEGURO,TAB1.RECEITA_BAGAGEM, "); sqlSb.append(" TAB1.RECEITA_SEGURO_OUTROS,TAB1.RECEITA_TARIFA,TAB1.RECEITA_PEDAGIO,TAB1.RECEITA_EMBARQUE, "); - sqlSb.append(" TAB1.PASSAGEIROS,TAB1.VIAGENS_EXTRA,TAB1.VIAGENS,TAB1.CVE_CLASE_SERVICIO, TAB1.KM_REAL "); + sqlSb.append(" TAB1.PASSAGEIROS,TAB1.VIAGENS_EXTRA,TAB1.VIAGENS,TAB1.CVE_CLASE_SERVICIO, TAB1.KM_REAL, TAB1.CORRIDA_ID "); sqlSb.append(" ) TAB "); sqlSb.append(" GROUP BY TAB.RUTA_ID, TAB.NUMRUTA, TAB.DESCRUTA, TAB.TARIFA, TAB.ASSENTOS, TAB.ROLOPERATIVO_ID, "); sqlSb.append(" TAB.INTERESTADUAL, TAB.GRUPO_LINHA, TAB.EXTENSAO_KM, TAB.CVE_CLASE_SERVICIO, TAB.INDSENTIDOIDA) SUB "); From e6fd9338b1c0866c314352d466c9ae8a92ecafdc Mon Sep 17 00:00:00 2001 From: "wallace.henrique" Date: Mon, 20 May 2024 18:08:14 -0300 Subject: [PATCH 6/6] fixes bug#AL-4145 --- pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 69a92b2ce..f22484c97 100644 --- a/pom.xml +++ b/pom.xml @@ -4,11 +4,11 @@ 4.0.0 br.com.rjconsultores ventaboletosadm - 1.77.4 + 1.77.5 war - 1.58.2 + 1.58.3 1.43.0 UTF-8 @@ -126,7 +126,7 @@ br.com.rjconsultores GeneradorBoletosCNAB - 1.7.0 + 1.7.1