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

fixes bug#21093 

qua:
dev:Valdevir
Corrigido para nao somar km doudbledeck

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@104971 d1611594-4594-4d17-8e1d-87c2c4800839
master
valdevir 2021-01-08 14:00:39 +00:00
parent 19f57a4ac1
commit b518936467
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -560,10 +560,10 @@ public class RelatorioLinhasHorario extends Relatorio {
sql.append("LEFT JOIN VIGENCIA_TARIFA VTF ON (TF.VIGENCIATARIFA_ID = VTF.VIGENCIATARIFA_ID AND C.FECCORRIDA BETWEEN VTF.FECINICIOVIGENCIA AND VTF.FECFINVIGENCIA ) ");
sql.append("INNER JOIN ");
sql.append("( ");
sql.append("SELECT RS.RUTA_ID, T.ORIGEN_ID, T.DESTINO_ID, NVL(T.CANTKMREAL,0) AS EXTENSAO ");
sql.append("FROM RUTA_SECUENCIA RS ");
sql.append("INNER JOIN TRAMO T ON RS.TRAMO_ID = T.TRAMO_ID ");
sql.append("WHERE RS.ACTIVO = 1 AND T.ACTIVO = 1");
sql.append("SELECT RC.RUTA_ID, T.ORIGEN_ID, T.DESTINO_ID, NVL(T.CANTKMREAL,0) AS EXTENSAO ");
sql.append("FROM RUTA_COMBINACION RC ");
sql.append("INNER JOIN TRAMO T ON RC.TRAMO_ID = T.TRAMO_ID ");
sql.append("WHERE RC.ACTIVO = 1 ");
sql.append(") TB5 ON TB5.RUTA_ID = C.RUTA_ID ");
sql.append("AND TB5.ORIGEN_ID = ORIGEM.PARADA_ID ");
sql.append("AND TB5.DESTINO_ID = DESTINO.PARADA_ID ");

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

Binary file not shown.

12
src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioLinhasHorario.jrxml
View File

@ -2,7 +2,7 @@
<jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="RelatorioLinhasHorario" pageWidth="842" pageHeight="595" orientation="Landscape" whenNoDataType="NoDataSection" columnWidth="802" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20" uuid="ae2cbb01-bc79-4d18-8206-3b59273fe793">
<property name="ireport.zoom" value="2.0"/>
<property name="ireport.x" value="0"/>
<property name="ireport.y" value="96"/>
<property name="ireport.y" value="131"/>
<parameter name="NOMBEMPRESA" class="java.lang.String"/>
<parameter name="DATA_INICIO" class="java.sql.Timestamp">
<defaultValueExpression><![CDATA[]]></defaultValueExpression>
@ -131,7 +131,7 @@
<variableExpression><![CDATA[$F{rsViagem}]]></variableExpression>
</variable>
<variable name="media_rsKm_group" class="java.math.BigDecimal" resetType="Group" resetGroup="groupRuta">
<variableExpression><![CDATA[$P{TOTAL_TOTAL}.divide( $P{TOTAL_KM_RODADO}, 2, BigDecimal.ROUND_HALF_UP )]]></variableExpression>
<variableExpression><![CDATA[!BigDecimal.ZERO.equals($P{TOTAL_KM_RODADO}) ? $P{TOTAL_TOTAL}.divide( $P{TOTAL_KM_RODADO}, 2, BigDecimal.ROUND_HALF_UP ) : BigDecimal.ZERO]]></variableExpression>
</variable>
<variable name="media_mpa_group" class="java.math.BigDecimal" resetType="Group" resetGroup="groupRuta">
<variableExpression><![CDATA[$V{mpa_group}]]></variableExpression>
@ -200,7 +200,7 @@
<variableExpression><![CDATA[$F{rsViagem}]]></variableExpression>
</variable>
<variable name="linha_media_rsKm_group" class="java.math.BigDecimal" resetType="Group" resetGroup="groupTipoLinha">
<variableExpression><![CDATA[$P{TOTAL_PASSAGENS}.divide( $P{TOTAL_KM_RODADO}, 2, BigDecimal.ROUND_HALF_UP )]]></variableExpression>
<variableExpression><![CDATA[!BigDecimal.ZERO.equals($P{TOTAL_KM_RODADO}) ? $P{TOTAL_PASSAGENS}.divide( $P{TOTAL_KM_RODADO}, 2, BigDecimal.ROUND_HALF_UP ) : BigDecimal.ZERO]]></variableExpression>
</variable>
<variable name="linha_media_mpa_group" class="java.math.BigDecimal" resetType="Group" resetGroup="groupTipoLinha" calculation="Sum">
<variableExpression><![CDATA[$F{mpa}]]></variableExpression>
@ -212,7 +212,7 @@
<variableExpression><![CDATA[$V{pedagio_group}]]></variableExpression>
</variable>
<variable name="TOTAL_RSKM" class="java.math.BigDecimal">
<variableExpression><![CDATA[$P{TOTAL_PASSAGENS}.divide( $P{TOTAL_KM_RODADO}, 2, BigDecimal.ROUND_HALF_UP )]]></variableExpression>
<variableExpression><![CDATA[!BigDecimal.ZERO.equals($P{TOTAL_KM_RODADO}) ? $P{TOTAL_PASSAGENS}.divide( $P{TOTAL_KM_RODADO}, 2, BigDecimal.ROUND_HALF_UP ) : BigDecimal.ZERO]]></variableExpression>
</variable>
<variable name="TOTAL_IAP" class="java.math.BigDecimal" calculation="Average">
<variableExpression><![CDATA[$F{iap}]]></variableExpression>
@ -230,11 +230,11 @@
<variableExpression><![CDATA[$F{mpe}]]></variableExpression>
</variable>
<variable name="media_group_rsKm" class="java.math.BigDecimal" resetType="Group" resetGroup="groupRuta">
<variableExpression><![CDATA[$V{total_group}.divide( $V{kmRodado_group}, 2, BigDecimal.ROUND_HALF_UP )]]></variableExpression>
<variableExpression><![CDATA[!BigDecimal.ZERO.equals($V{kmRodado_group}) ? $V{total_group}.divide( $V{kmRodado_group}, 2, BigDecimal.ROUND_HALF_UP ) : BigDecimal.ZERO]]></variableExpression>
</variable>
<variable name="variable1" class="java.lang.String"/>
<variable name="linha_media_group_rsKm" class="java.math.BigDecimal" resetType="Group" resetGroup="groupTipoLinha">
<variableExpression><![CDATA[$V{linha_total_group}.divide( $V{linha_kmRodado_group}, 2, BigDecimal.ROUND_HALF_UP )]]></variableExpression>
<variableExpression><![CDATA[!BigDecimal.ZERO.equals($V{linha_kmRodado_group}) ? $V{linha_total_group}.divide( $V{linha_kmRodado_group}, 2, BigDecimal.ROUND_HALF_UP ) : BigDecimal.ZERO]]></variableExpression>
</variable>
<group name="groupTipoLinha">
<groupExpression><![CDATA[$F{tipoLinha}]]></groupExpression>