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

Merge pull request 'fixes bug#AL-4068' (!457) from AL-4068 into master 

Reviewed-on: adm/VentaBoletosAdm#457
Reviewed-by: aristides <aristides@rjconsultores.com.br>
master 1.61.1
Gleison da Cruz 2024-03-26 18:28:54 +00:00
parent e4808172cc a67975728f
commit 69d516259b
2 changed files with 3 additions and 2 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> <modelVersion>4.0.0</modelVersion>
<groupId>br.com.rjconsultores</groupId> <groupId>br.com.rjconsultores</groupId>
<artifactId>ventaboletosadm</artifactId> <artifactId>ventaboletosadm</artifactId>
<version>1.61.0</version> <version>1.61.1</version>
<packaging>war</packaging> <packaging>war</packaging>
<properties> <properties>

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

@ -109,6 +109,7 @@ public class RelatorioResumoLinhasAnalitico extends Relatorio {
relatorioBean.setTARIFA(rset.getBigDecimal("TARIFA")); relatorioBean.setTARIFA(rset.getBigDecimal("TARIFA"));
relatorioBean.setEQ(rset.getBigDecimal("EQ")); relatorioBean.setEQ(rset.getBigDecimal("EQ"));
relatorioBean.setIAP(rset.getBigDecimal("IAP")); relatorioBean.setIAP(rset.getBigDecimal("IAP"));
relatorioBean.setASSENTOS(rset.getBigDecimal("ASSENTOS"));
setDadosRelatorio.add(relatorioBean); setDadosRelatorio.add(relatorioBean);
} }
@ -164,7 +165,7 @@ public class RelatorioResumoLinhasAnalitico extends Relatorio {
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)), 2) EQUIVALENTE "); 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)), 2) EQUIVALENTE ");
sqlSb.append(" FROM CORRIDA CO, BOLETO BO "); sqlSb.append(" FROM CORRIDA CO, BOLETO BO ");
sqlSb.append(" WHERE CO.CORRIDA_ID = BO.CORRIDA_ID "); sqlSb.append(" WHERE CO.CORRIDA_ID = BO.CORRIDA_ID ");
sqlSb.append(" AND CO.FECCORRIDA = BO.FECCORRIDA "); sqlSb.append(" AND CO.FECCORRIDA 9= BO.FECCORRIDA ");
sqlSb.append(" AND BO.ACTIVO = 1 "); 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(" 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(" GROUP BY CO.FECCORRIDA, CO.RUTA_ID, BO.PRECIOBASE, BO.NUMKMVIAJE) PE ");