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

fixes bug#21744 

dev: Valvevir
qua:

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@105568 d1611594-4594-4d17-8e1d-87c2c4800839
master
fabio 2021-03-01 14:45:46 +00:00
parent 65030fe371
commit b5ab1315e4
3 changed files with 35 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioAcompanhamentoEquivalentes.java
View File

@ -230,7 +230,6 @@ public class RelatorioAcompanhamentoEquivalentes extends Relatorio {
sql = getSqlIndicadorReceitaViagem(isServicoExtra,considerarApenasTarifa); sql = getSqlIndicadorReceitaViagem(isServicoExtra,considerarApenasTarifa);
break; break;
} }
System.out.println(sql);
return getListaValoresIndicadores(corridaId, rolOperativoId, indicador, assentos, sql, dataInicial, rutaId, horario, return getListaValoresIndicadores(corridaId, rolOperativoId, indicador, assentos, sql, dataInicial, rutaId, horario,
diagramaAutoBusId); diagramaAutoBusId);

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

Binary file not shown.

70
src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioAcompanhamentoEquivalentes.jrxml
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<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="RelatorioAcompanhamentoEquivalentes" pageWidth="852" pageHeight="595" orientation="Landscape" whenNoDataType="NoDataSection" columnWidth="832" leftMargin="10" rightMargin="10" topMargin="20" bottomMargin="20" isFloatColumnFooter="true" uuid="efbc89d4-6f08-4ea5-802f-d4f48ed208e2"> <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="RelatorioAcompanhamentoEquivalentes" pageWidth="852" pageHeight="595" orientation="Landscape" whenNoDataType="NoDataSection" columnWidth="832" leftMargin="10" rightMargin="10" topMargin="20" bottomMargin="20" isFloatColumnFooter="true" uuid="efbc89d4-6f08-4ea5-802f-d4f48ed208e2">
<property name="ireport.zoom" value="1.0"/> <property name="ireport.zoom" value="1.5"/>
<property name="ireport.x" value="99"/> <property name="ireport.x" value="0"/>
<property name="ireport.y" value="0"/> <property name="ireport.y" value="0"/>
<property name="net.sf.jasperreports.export.xls.exclude.origin.band.2" value="pageHeader"/> <property name="net.sf.jasperreports.export.xls.exclude.origin.band.2" value="pageHeader"/>
<property name="net.sf.jasperreports.export.xls.exclude.origin.keep.first.band.2" value="columnHeader"/> <property name="net.sf.jasperreports.export.xls.exclude.origin.keep.first.band.2" value="columnHeader"/>
@ -110,135 +110,135 @@
<field name="PREFIXO" class="java.lang.String"/> <field name="PREFIXO" class="java.lang.String"/>
<variable name="1" class="java.math.BigDecimal" resetType="Group" resetGroup="groupLinha" calculation="Sum"> <variable name="1" class="java.math.BigDecimal" resetType="Group" resetGroup="groupLinha" calculation="Sum">
<variableExpression><![CDATA[$F{1}]]></variableExpression> <variableExpression><![CDATA[$F{1}]]></variableExpression>
<initialValueExpression><![CDATA[0]]></initialValueExpression> <initialValueExpression><![CDATA[java.math.BigDecimal.ZERO]]></initialValueExpression>
</variable> </variable>
<variable name="2" class="java.math.BigDecimal" resetType="Group" resetGroup="groupLinha" calculation="Sum"> <variable name="2" class="java.math.BigDecimal" resetType="Group" resetGroup="groupLinha" calculation="Sum">
<variableExpression><![CDATA[$F{2}]]></variableExpression> <variableExpression><![CDATA[$F{2}]]></variableExpression>
<initialValueExpression><![CDATA[0]]></initialValueExpression> <initialValueExpression><![CDATA[java.math.BigDecimal.ZERO]]></initialValueExpression>
</variable> </variable>
<variable name="3" class="java.math.BigDecimal" resetType="Group" resetGroup="groupLinha" calculation="Sum"> <variable name="3" class="java.math.BigDecimal" resetType="Group" resetGroup="groupLinha" calculation="Sum">
<variableExpression><![CDATA[$F{3}]]></variableExpression> <variableExpression><![CDATA[$F{3}]]></variableExpression>
<initialValueExpression><![CDATA[0]]></initialValueExpression> <initialValueExpression><![CDATA[java.math.BigDecimal.ZERO]]></initialValueExpression>
</variable> </variable>
<variable name="4" class="java.math.BigDecimal" resetType="Group" resetGroup="groupLinha" calculation="Sum"> <variable name="4" class="java.math.BigDecimal" resetType="Group" resetGroup="groupLinha" calculation="Sum">
<variableExpression><![CDATA[$F{4}]]></variableExpression> <variableExpression><![CDATA[$F{4}]]></variableExpression>
<initialValueExpression><![CDATA[0]]></initialValueExpression> <initialValueExpression><![CDATA[java.math.BigDecimal.ZERO]]></initialValueExpression>
</variable> </variable>
<variable name="5" class="java.math.BigDecimal" resetType="Group" resetGroup="groupLinha" calculation="Sum"> <variable name="5" class="java.math.BigDecimal" resetType="Group" resetGroup="groupLinha" calculation="Sum">
<variableExpression><![CDATA[$F{5}]]></variableExpression> <variableExpression><![CDATA[$F{5}]]></variableExpression>
<initialValueExpression><![CDATA[0]]></initialValueExpression> <initialValueExpression><![CDATA[java.math.BigDecimal.ZERO]]></initialValueExpression>
</variable> </variable>
<variable name="6" class="java.math.BigDecimal" resetType="Group" resetGroup="groupLinha" calculation="Sum"> <variable name="6" class="java.math.BigDecimal" resetType="Group" resetGroup="groupLinha" calculation="Sum">
<variableExpression><![CDATA[$F{6}]]></variableExpression> <variableExpression><![CDATA[$F{6}]]></variableExpression>
<initialValueExpression><![CDATA[0]]></initialValueExpression> <initialValueExpression><![CDATA[java.math.BigDecimal.ZERO]]></initialValueExpression>
</variable> </variable>
<variable name="7" class="java.math.BigDecimal" resetType="Group" resetGroup="groupLinha" calculation="Sum"> <variable name="7" class="java.math.BigDecimal" resetType="Group" resetGroup="groupLinha" calculation="Sum">
<variableExpression><![CDATA[$F{7}]]></variableExpression> <variableExpression><![CDATA[$F{7}]]></variableExpression>
<initialValueExpression><![CDATA[0]]></initialValueExpression> <initialValueExpression><![CDATA[java.math.BigDecimal.ZERO]]></initialValueExpression>
</variable> </variable>
<variable name="8" class="java.math.BigDecimal" resetType="Group" resetGroup="groupLinha" calculation="Sum"> <variable name="8" class="java.math.BigDecimal" resetType="Group" resetGroup="groupLinha" calculation="Sum">
<variableExpression><![CDATA[$F{8}]]></variableExpression> <variableExpression><![CDATA[$F{8}]]></variableExpression>
<initialValueExpression><![CDATA[0]]></initialValueExpression> <initialValueExpression><![CDATA[java.math.BigDecimal.ZERO]]></initialValueExpression>
</variable> </variable>
<variable name="9" class="java.math.BigDecimal" resetType="Group" resetGroup="groupLinha" calculation="Sum"> <variable name="9" class="java.math.BigDecimal" resetType="Group" resetGroup="groupLinha" calculation="Sum">
<variableExpression><![CDATA[$F{9}]]></variableExpression> <variableExpression><![CDATA[$F{9}]]></variableExpression>
<initialValueExpression><![CDATA[0]]></initialValueExpression> <initialValueExpression><![CDATA[java.math.BigDecimal.ZERO]]></initialValueExpression>
</variable> </variable>
<variable name="10" class="java.math.BigDecimal" resetType="Group" resetGroup="groupLinha" calculation="Sum"> <variable name="10" class="java.math.BigDecimal" resetType="Group" resetGroup="groupLinha" calculation="Sum">
<variableExpression><![CDATA[$F{10}]]></variableExpression> <variableExpression><![CDATA[$F{10}]]></variableExpression>
<initialValueExpression><![CDATA[0]]></initialValueExpression> <initialValueExpression><![CDATA[java.math.BigDecimal.ZERO]]></initialValueExpression>
</variable> </variable>
<variable name="11" class="java.math.BigDecimal" resetType="Group" resetGroup="groupLinha" calculation="Sum"> <variable name="11" class="java.math.BigDecimal" resetType="Group" resetGroup="groupLinha" calculation="Sum">
<variableExpression><![CDATA[$F{11}]]></variableExpression> <variableExpression><![CDATA[$F{11}]]></variableExpression>
<initialValueExpression><![CDATA[0]]></initialValueExpression> <initialValueExpression><![CDATA[java.math.BigDecimal.ZERO]]></initialValueExpression>
</variable> </variable>
<variable name="12" class="java.math.BigDecimal" resetType="Group" resetGroup="groupLinha" calculation="Sum"> <variable name="12" class="java.math.BigDecimal" resetType="Group" resetGroup="groupLinha" calculation="Sum">
<variableExpression><![CDATA[$F{12}]]></variableExpression> <variableExpression><![CDATA[$F{12}]]></variableExpression>
<initialValueExpression><![CDATA[0]]></initialValueExpression> <initialValueExpression><![CDATA[java.math.BigDecimal.ZERO]]></initialValueExpression>
</variable> </variable>
<variable name="13" class="java.math.BigDecimal" resetType="Group" resetGroup="groupLinha" calculation="Sum"> <variable name="13" class="java.math.BigDecimal" resetType="Group" resetGroup="groupLinha" calculation="Sum">
<variableExpression><![CDATA[$F{13}]]></variableExpression> <variableExpression><![CDATA[$F{13}]]></variableExpression>
<initialValueExpression><![CDATA[0]]></initialValueExpression> <initialValueExpression><![CDATA[java.math.BigDecimal.ZERO]]></initialValueExpression>
</variable> </variable>
<variable name="14" class="java.math.BigDecimal" resetType="Group" resetGroup="groupLinha" calculation="Sum"> <variable name="14" class="java.math.BigDecimal" resetType="Group" resetGroup="groupLinha" calculation="Sum">
<variableExpression><![CDATA[$F{14}]]></variableExpression> <variableExpression><![CDATA[$F{14}]]></variableExpression>
<initialValueExpression><![CDATA[0]]></initialValueExpression> <initialValueExpression><![CDATA[java.math.BigDecimal.ZERO]]></initialValueExpression>
</variable> </variable>
<variable name="15" class="java.math.BigDecimal" resetType="Group" resetGroup="groupLinha" calculation="Sum"> <variable name="15" class="java.math.BigDecimal" resetType="Group" resetGroup="groupLinha" calculation="Sum">
<variableExpression><![CDATA[$F{15}]]></variableExpression> <variableExpression><![CDATA[$F{15}]]></variableExpression>
<initialValueExpression><![CDATA[0]]></initialValueExpression> <initialValueExpression><![CDATA[java.math.BigDecimal.ZERO]]></initialValueExpression>
</variable> </variable>
<variable name="16" class="java.math.BigDecimal" resetType="Group" resetGroup="groupLinha" calculation="Sum"> <variable name="16" class="java.math.BigDecimal" resetType="Group" resetGroup="groupLinha" calculation="Sum">
<variableExpression><![CDATA[$F{16}]]></variableExpression> <variableExpression><![CDATA[$F{16}]]></variableExpression>
<initialValueExpression><![CDATA[0]]></initialValueExpression> <initialValueExpression><![CDATA[java.math.BigDecimal.ZERO]]></initialValueExpression>
</variable> </variable>
<variable name="17" class="java.math.BigDecimal" resetType="Group" resetGroup="groupLinha" calculation="Sum"> <variable name="17" class="java.math.BigDecimal" resetType="Group" resetGroup="groupLinha" calculation="Sum">
<variableExpression><![CDATA[$F{17}]]></variableExpression> <variableExpression><![CDATA[$F{17}]]></variableExpression>
<initialValueExpression><![CDATA[0]]></initialValueExpression> <initialValueExpression><![CDATA[java.math.BigDecimal.ZERO]]></initialValueExpression>
</variable> </variable>
<variable name="18" class="java.math.BigDecimal" resetType="Group" resetGroup="groupLinha" calculation="Sum"> <variable name="18" class="java.math.BigDecimal" resetType="Group" resetGroup="groupLinha" calculation="Sum">
<variableExpression><![CDATA[$F{18}]]></variableExpression> <variableExpression><![CDATA[$F{18}]]></variableExpression>
<initialValueExpression><![CDATA[0]]></initialValueExpression> <initialValueExpression><![CDATA[java.math.BigDecimal.ZERO]]></initialValueExpression>
</variable> </variable>
<variable name="19" class="java.math.BigDecimal" resetType="Group" resetGroup="groupLinha" calculation="Sum"> <variable name="19" class="java.math.BigDecimal" resetType="Group" resetGroup="groupLinha" calculation="Sum">
<variableExpression><![CDATA[$F{19}]]></variableExpression> <variableExpression><![CDATA[$F{19}]]></variableExpression>
<initialValueExpression><![CDATA[0]]></initialValueExpression> <initialValueExpression><![CDATA[java.math.BigDecimal.ZERO]]></initialValueExpression>
</variable> </variable>
<variable name="20" class="java.math.BigDecimal" resetType="Group" resetGroup="groupLinha" calculation="Sum"> <variable name="20" class="java.math.BigDecimal" resetType="Group" resetGroup="groupLinha" calculation="Sum">
<variableExpression><![CDATA[$F{20}]]></variableExpression> <variableExpression><![CDATA[$F{20}]]></variableExpression>
<initialValueExpression><![CDATA[0]]></initialValueExpression> <initialValueExpression><![CDATA[java.math.BigDecimal.ZERO]]></initialValueExpression>
</variable> </variable>
<variable name="21" class="java.math.BigDecimal" resetType="Group" resetGroup="groupLinha" calculation="Sum"> <variable name="21" class="java.math.BigDecimal" resetType="Group" resetGroup="groupLinha" calculation="Sum">
<variableExpression><![CDATA[$F{21}]]></variableExpression> <variableExpression><![CDATA[$F{21}]]></variableExpression>
<initialValueExpression><![CDATA[0]]></initialValueExpression> <initialValueExpression><![CDATA[java.math.BigDecimal.ZERO]]></initialValueExpression>
</variable> </variable>
<variable name="22" class="java.math.BigDecimal" resetType="Group" resetGroup="groupLinha" calculation="Sum"> <variable name="22" class="java.math.BigDecimal" resetType="Group" resetGroup="groupLinha" calculation="Sum">
<variableExpression><![CDATA[$F{22}]]></variableExpression> <variableExpression><![CDATA[$F{22}]]></variableExpression>
<initialValueExpression><![CDATA[0]]></initialValueExpression> <initialValueExpression><![CDATA[java.math.BigDecimal.ZERO]]></initialValueExpression>
</variable> </variable>
<variable name="23" class="java.math.BigDecimal" resetType="Group" resetGroup="groupLinha" calculation="Sum"> <variable name="23" class="java.math.BigDecimal" resetType="Group" resetGroup="groupLinha" calculation="Sum">
<variableExpression><![CDATA[$F{23}]]></variableExpression> <variableExpression><![CDATA[$F{23}]]></variableExpression>
<initialValueExpression><![CDATA[0]]></initialValueExpression> <initialValueExpression><![CDATA[java.math.BigDecimal.ZERO]]></initialValueExpression>
</variable> </variable>
<variable name="24" class="java.math.BigDecimal" resetType="Group" resetGroup="groupLinha" calculation="Sum"> <variable name="24" class="java.math.BigDecimal" resetType="Group" resetGroup="groupLinha" calculation="Sum">
<variableExpression><![CDATA[$F{24}]]></variableExpression> <variableExpression><![CDATA[$F{24}]]></variableExpression>
<initialValueExpression><![CDATA[0]]></initialValueExpression> <initialValueExpression><![CDATA[java.math.BigDecimal.ZERO]]></initialValueExpression>
</variable> </variable>
<variable name="25" class="java.math.BigDecimal" resetType="Group" resetGroup="groupLinha" calculation="Sum"> <variable name="25" class="java.math.BigDecimal" resetType="Group" resetGroup="groupLinha" calculation="Sum">
<variableExpression><![CDATA[$F{25}]]></variableExpression> <variableExpression><![CDATA[$F{25}]]></variableExpression>
<initialValueExpression><![CDATA[0]]></initialValueExpression> <initialValueExpression><![CDATA[java.math.BigDecimal.ZERO]]></initialValueExpression>
</variable> </variable>
<variable name="26" class="java.math.BigDecimal" resetType="Group" resetGroup="groupLinha" calculation="Sum"> <variable name="26" class="java.math.BigDecimal" resetType="Group" resetGroup="groupLinha" calculation="Sum">
<variableExpression><![CDATA[$F{26}]]></variableExpression> <variableExpression><![CDATA[$F{26}]]></variableExpression>
<initialValueExpression><![CDATA[0]]></initialValueExpression> <initialValueExpression><![CDATA[java.math.BigDecimal.ZERO]]></initialValueExpression>
</variable> </variable>
<variable name="27" class="java.math.BigDecimal" resetType="Group" resetGroup="groupLinha" calculation="Sum"> <variable name="27" class="java.math.BigDecimal" resetType="Group" resetGroup="groupLinha" calculation="Sum">
<variableExpression><![CDATA[$F{27}]]></variableExpression> <variableExpression><![CDATA[$F{27}]]></variableExpression>
<initialValueExpression><![CDATA[0]]></initialValueExpression> <initialValueExpression><![CDATA[java.math.BigDecimal.ZERO]]></initialValueExpression>
</variable> </variable>
<variable name="28" class="java.math.BigDecimal" resetType="Group" resetGroup="groupLinha" calculation="Sum"> <variable name="28" class="java.math.BigDecimal" resetType="Group" resetGroup="groupLinha" calculation="Sum">
<variableExpression><![CDATA[$F{28}]]></variableExpression> <variableExpression><![CDATA[$F{28}]]></variableExpression>
<initialValueExpression><![CDATA[0]]></initialValueExpression> <initialValueExpression><![CDATA[java.math.BigDecimal.ZERO]]></initialValueExpression>
</variable> </variable>
<variable name="29" class="java.math.BigDecimal" resetType="Group" resetGroup="groupLinha" calculation="Sum"> <variable name="29" class="java.math.BigDecimal" resetType="Group" resetGroup="groupLinha" calculation="Sum">
<variableExpression><![CDATA[$F{29}]]></variableExpression> <variableExpression><![CDATA[$F{29}]]></variableExpression>
<initialValueExpression><![CDATA[0]]></initialValueExpression> <initialValueExpression><![CDATA[java.math.BigDecimal.ZERO]]></initialValueExpression>
</variable> </variable>
<variable name="30" class="java.math.BigDecimal" resetType="Group" resetGroup="groupLinha" calculation="Sum"> <variable name="30" class="java.math.BigDecimal" resetType="Group" resetGroup="groupLinha" calculation="Sum">
<variableExpression><![CDATA[$F{30}]]></variableExpression> <variableExpression><![CDATA[$F{30}]]></variableExpression>
<initialValueExpression><![CDATA[0]]></initialValueExpression> <initialValueExpression><![CDATA[java.math.BigDecimal.ZERO]]></initialValueExpression>
</variable> </variable>
<variable name="31" class="java.math.BigDecimal" resetType="Group" resetGroup="groupLinha" calculation="Sum"> <variable name="31" class="java.math.BigDecimal" resetType="Group" resetGroup="groupLinha" calculation="Sum">
<variableExpression><![CDATA[$F{31}]]></variableExpression> <variableExpression><![CDATA[$F{31}]]></variableExpression>
<initialValueExpression><![CDATA[0]]></initialValueExpression> <initialValueExpression><![CDATA[java.math.BigDecimal.ZERO]]></initialValueExpression>
</variable> </variable>
<variable name="MEDIA" class="java.math.BigDecimal" resetType="Group" resetGroup="groupLinha" calculation="Sum"> <variable name="MEDIA" class="java.math.BigDecimal" resetType="Group" resetGroup="groupLinha" calculation="Sum">
<variableExpression><![CDATA[$F{MEDIA}]]></variableExpression> <variableExpression><![CDATA[$F{MEDIA}]]></variableExpression>
<initialValueExpression><![CDATA[0]]></initialValueExpression> <initialValueExpression><![CDATA[java.math.BigDecimal.ZERO]]></initialValueExpression>
</variable> </variable>
<variable name="TOTAL" class="java.math.BigDecimal" resetType="Group" resetGroup="groupLinha" calculation="Sum"> <variable name="TOTAL" class="java.math.BigDecimal" resetType="Group" resetGroup="groupLinha" calculation="Sum">
<variableExpression><![CDATA[$F{TOTAL}]]></variableExpression> <variableExpression><![CDATA[$F{TOTAL}]]></variableExpression>
<initialValueExpression><![CDATA[0]]></initialValueExpression> <initialValueExpression><![CDATA[java.math.BigDecimal.ZERO]]></initialValueExpression>
</variable> </variable>
<group name="groupInterestaduak"> <group name="groupInterestaduak">
<groupExpression><![CDATA[$F{INTERESTADUAL}]]></groupExpression> <groupExpression><![CDATA[$F{INTERESTADUAL}]]></groupExpression>