fabio
/
AdmMono
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request 'fixes bug#AL-4360' (!529) from AL-4360 into master 

Reviewed-on: adm/VentaBoletosAdm#529
Reviewed-by: wallace <wallace@rjconsultores.com.br>
master
Gleison da Cruz 2024-05-22 12:32:06 +00:00
parent 6b90617873 aca4988a46
commit 88414ae27c
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>br.com.rjconsultores</groupId>
<artifactId>ventaboletosadm</artifactId>
<version>1.78.0</version>
<version>1.78.1</version>
<packaging>war</packaging>
<properties>

8
src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioResumoLinhasAnalitico.java
View File

@ -173,6 +173,10 @@ public class RelatorioResumoLinhasAnalitico extends Relatorio {
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 TR.ORIGEN_ID = CO.ORIGEN_ID ");
sqlSb.append(" AND TR.DESTINO_ID = CO.DESTINO_ID ");
sqlSb.append(" AND RS.ACTIVO = 1)), 2) EQUIVALENTE ");
}
sqlSb.append(" FROM CORRIDA CO, BOLETO BO ");
@ -180,7 +184,7 @@ public class RelatorioResumoLinhasAnalitico extends Relatorio {
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, CO.CORRIDA_ID) PE ");
sqlSb.append(" GROUP BY CO.FECCORRIDA, CO.RUTA_ID, BO.PRECIOBASE, BO.NUMKMVIAJE, CO.CORRIDA_ID, CO.ORIGEN_ID, CO.DESTINO_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 ");
@ -194,7 +198,7 @@ public class RelatorioResumoLinhasAnalitico extends Relatorio {
sqlSb.append(" DA.CANTASIENTOS ASSENTOS, ");
sqlSb.append(" RO.ROLOPERATIVO_ID, ");
sqlSb.append(" CASE WHEN CO.ESTADO_ID <> CD.ESTADO_ID THEN 'S' ELSE 'N' END INTERESTADUAL, ");
sqlSb.append(" NVL(GR.DESCGRUPO, 'Não Definido') GRUPO_LINHA, ");
sqlSb.append(" NVL(GR.DESCGRUPO, 'Não Definido') GRUPO_LINHA, ");
if (parametros.get("SOMAR_KM_RODADOS_POR").equals("SEQUENCIA")) {
sqlSb.append(" (SELECT SUM(NVL(RS.KMORIGINAL,0)) FROM RUTA_SECUENCIA RS, TRAMO TR WHERE RS.RUTA_ID = RT.RUTA_ID AND RS.TRAMO_ID = TR.TRAMO_ID AND RS.ACTIVO = 1) EXTENSAO_KM, ");
}else {