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

Merge pull request 'fixes bug#AL-4005' (!453) from AL-4005 into master 

Reviewed-on: adm/VentaBoletosAdm#453
Reviewed-by: Célio de Souza Ribeiro JR <celio@rjconsultores.com.br>
master 1.59.4
Gleison da Cruz 2024-03-22 18:17:04 +00:00
parent c492ec5de0 0903092105
commit 140b8d0932
4 changed files with 15 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.59.3</version>
<version>1.59.4</version>
<packaging>war</packaging>
<properties>

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

@ -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 ");

BIN
src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioResumoLinhasAnalitico.jasper
View File

Binary file not shown.

4
src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioResumoLinhasAnalitico.jrxml
View File

@ -909,9 +909,9 @@
<detail>
<band height="16" splitType="Stretch">
<textField isBlankWhenNull="true">
<reportElement uuid="3806ad9e-a061-446b-b913-8e5154e42c17" x="0" y="0" width="15" height="9"/>
<reportElement uuid="3806ad9e-a061-446b-b913-8e5154e42c17" x="0" y="0" width="15" height="16"/>
<textElement verticalAlignment="Middle">
<font size="5"/>
<font size="4"/>
</textElement>
<textFieldExpression><![CDATA[$F{NUMRUTA}]]></textFieldExpression>
</textField>