From 090309210514935f94f28b704890993af48aa56f Mon Sep 17 00:00:00 2001 From: "gleison.cruz" Date: Fri, 22 Mar 2024 15:15:39 -0300 Subject: [PATCH] fixes bug#AL-4005 --- pom.xml | 2 +- .../impl/RelatorioResumoLinhasAnalitico.java | 12 ++++++++++++ .../RelatorioResumoLinhasAnalitico.jasper | Bin 111363 -> 111368 bytes .../RelatorioResumoLinhasAnalitico.jrxml | 4 ++-- 4 files changed, 15 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index f15af23c9..198b5ea8d 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 br.com.rjconsultores ventaboletosadm - 1.59.3 + 1.59.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 21aa049ff..46860bfad 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioResumoLinhasAnalitico.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioResumoLinhasAnalitico.java @@ -197,6 +197,11 @@ public class RelatorioResumoLinhasAnalitico extends Relatorio { sqlSb.append(" COUNT(DISTINCT CASE WHEN CR.TIPOSERVICIO_ID <> 2 THEN CR.FECCORRIDA || CR.CORRIDA_ID ELSE NULL END) VIAGENS, "); sqlSb.append(" NVL(CS.CVECLASE, ' ') CVE_CLASE_SERVICIO "); sqlSb.append(" FROM RUTA RT, "); + + if (!parametros.get("SOMAR_KM_RODADOS_POR").equals("SEQUENCIA")) { + sqlSb.append(" RUTA_COMBINACION RC, "); + } + sqlSb.append(" BOLETO BL, "); sqlSb.append(" CORRIDA CR, "); sqlSb.append(" TRAMO TR, "); @@ -231,6 +236,13 @@ public class RelatorioResumoLinhasAnalitico extends Relatorio { sqlSb.append(" AND TF.CLASESERVICIO_ID = CR.CLASESERVICIO_ID "); sqlSb.append(" AND TR.ORIGEN_ID = CR.ORIGEN_ID "); sqlSb.append(" AND TR.DESTINO_ID = CR.DESTINO_ID "); + + if (!parametros.get("SOMAR_KM_RODADOS_POR").equals("SEQUENCIA")) { + sqlSb.append(" AND RC.RUTA_ID = RT.RUTA_ID "); + sqlSb.append(" AND RC.TRAMO_ID = TR.TRAMO_ID "); + sqlSb.append(" AND RC.ACTIVO = 1 "); + } + sqlSb.append(" AND TF.MARCA_ID = CR.MARCA_ID "); sqlSb.append(" AND TF.RUTA_ID = CR.RUTA_ID "); sqlSb.append(" AND TF.TRAMO_ID = TR.TRAMO_ID "); diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioResumoLinhasAnalitico.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioResumoLinhasAnalitico.jasper index c35c26e6ab2a9e2e223180c89e4f79dcb4bd07fe..28a0d6b4fe87a3ef8277ad1fcb551ae1c869b092 100644 GIT binary patch delta 15843 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 delta 15726 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 - + - +