From 37bb26c7e77506d0edd9495c3246405869a5844d Mon Sep 17 00:00:00 2001
From: valdevir <valdevir@d1611594-4594-4d17-8e1d-87c2c4800839>
Date: Wed, 24 Mar 2021 12:09:30 +0000
Subject: [PATCH] fixes bug#21488 qua: dev:Wallace

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@105903 d1611594-4594-4d17-8e1d-87c2c4800839
---
 .../impl/RelatorioReceitaDiariaAgencia.java   |   4 +++-
 .../RelatorioLinhasHorarioSimplificado.jasper | Bin 86648 -> 86647 bytes
 .../RelatorioLinhasHorarioSimplificado.jrxml  |  10 +++++-----
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioReceitaDiariaAgencia.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioReceitaDiariaAgencia.java
index e06762821..f8e9a4693 100644
--- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioReceitaDiariaAgencia.java
+++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioReceitaDiariaAgencia.java
@@ -104,7 +104,9 @@ public class RelatorioReceitaDiariaAgencia extends Relatorio  {
 					StringBuilder strNumPuntoVenta = new StringBuilder();
 
 					for (PuntoVenta s : (ArrayList<PuntoVenta>) parametros.get("NUMPUNTOVENTA")) {
-						strNumPuntoVenta.append("," + s.getNumPuntoVenta() + ",");
+						if(s!=null && s.getNumPuntoVenta()!=null) {
+							strNumPuntoVenta.append("," + s.getNumPuntoVenta() + ",");							
+						}
 					}
 					stmt.setString("NUMPUNTOVENTA", strNumPuntoVenta.toString());
 				}
diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioLinhasHorarioSimplificado.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioLinhasHorarioSimplificado.jasper
index c3549d600884cc84aea75d678b74da3f6b59fc98..d0b6352598c7e9dc2c1b10991a6ee82c6d50655e 100644
GIT binary patch
delta 278
zcmeydg!TIp)(!tsCdaz7PyQPyGkJrr_+(puj?Gr77DAK%rD#p|&E?v>x|~Ij!@|g-
zqPU1bXR;x?`sRBb&qXJ%pKrZs{vKv-u9Ezc#GLq|(vrl<52i^9vXn6JX6FXwrzEE2
zLqsReG~2AX*xpUt%+%Q2#K7Fhz&PI6%+$=xfSrMn5oo61ALY%9UPfATr*32FIl$DW
zwS_TvJDVz_HzQ;0^dL3HC5-XgzpF9s<O3>T=7lNPZ3<DqZVpzk#vH0Z1g4<C4WeL=
fJ6J)Y2jfLf5ezq!Fc<+nB{RA11?TkaAVyvQFC|^j

delta 249
zcmeyqg!RV~)(!tsCfhFJo6Hr&KY4?%_+(puj?E6K7D9XiIhlDGiSda^#rZk$MUywE
zD^5O>&9!+=Ig22Np@~sNaS?;gWJ7lK&G$Q=i%!1PXT6zm{vPJZ(KB;5Yb>^R6E`(7
zGP5u@vNSV~w=^_2F*IRkU}OYpDP)z|JnLnG_4EhIj1t?0R2l6U8RMr1sxdBM%-{Y^
zjd3R*xBNC{-UCc+T3Z;Ex9>7#^ad$lGY2bJZ4Ol+0#lIh22rrv9jqY1gYhD#2!`b)
Q3`Ua^U#L#c3S#610FuN}IsgCw

diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioLinhasHorarioSimplificado.jrxml b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioLinhasHorarioSimplificado.jrxml
index 21ad41d40..039628aab 100644
--- a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioLinhasHorarioSimplificado.jrxml
+++ b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioLinhasHorarioSimplificado.jrxml
@@ -1,7 +1,7 @@
 <?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="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="142"/>
+	<property name="ireport.x" value="828"/>
 	<property name="ireport.y" value="145"/>
 	<parameter name="NOMBEMPRESA" class="java.lang.String"/>
 	<parameter name="DATA_INICIO" class="java.sql.Timestamp">
@@ -154,7 +154,7 @@
 	<variable name="linha_absol_group" class="java.math.BigDecimal" resetType="Group" resetGroup="groupTipoLinha" incrementType="Group" incrementGroup="groupRuta" calculation="Sum">
 		<variableExpression><![CDATA[$V{absol_group}]]></variableExpression>
 	</variable>
-	<variable name="absol_group" class="java.math.BigDecimal" resetType="Group" resetGroup="groupRuta" calculation="Sum">
+	<variable name="absol_group" class="java.math.BigDecimal" resetType="Group" resetGroup="ruta" calculation="Sum">
 		<variableExpression><![CDATA[$F{absol}]]></variableExpression>
 	</variable>
 	<variable name="passagens_ruta" class="java.math.BigDecimal" resetType="Group" resetGroup="ruta" calculation="Sum">
@@ -182,7 +182,7 @@
 		<variableExpression><![CDATA[$V{absol_group}]]></variableExpression>
 	</variable>
 	<variable name="media_ruta_rsKm" class="java.math.BigDecimal" resetType="Group" resetGroup="ruta">
-		<variableExpression><![CDATA[$V{total_group}.divide( $V{kmRodado_group}, 2, BigDecimal.ROUND_HALF_UP )]]></variableExpression>
+		<variableExpression><![CDATA[$V{total_ruta}.divide( $V{kmRodado_ruta}, 2, BigDecimal.ROUND_HALF_UP )]]></variableExpression>
 	</variable>
 	<group name="groupTipoLinha">
 		<groupExpression><![CDATA[$F{tipoLinha}]]></groupExpression>
@@ -370,7 +370,7 @@
 					<textElement textAlignment="Right">
 						<font size="6" isBold="true"/>
 					</textElement>
-					<textFieldExpression><![CDATA[$V{absol_group}]]></textFieldExpression>
+					<textFieldExpression><![CDATA[$V{linha_absol_group}]]></textFieldExpression>
 				</textField>
 				<textField isBlankWhenNull="true">
 					<reportElement uuid="04e07f25-0557-4747-84ee-d2b7a8599a35" x="504" y="1" width="22" height="10"/>
@@ -461,7 +461,7 @@
 					<textElement textAlignment="Right">
 						<font size="6" isBold="true"/>
 					</textElement>
-					<textFieldExpression><![CDATA[$V{linha_absol_ruta}]]></textFieldExpression>
+					<textFieldExpression><![CDATA[$V{absol_group}]]></textFieldExpression>
 				</textField>
 				<textField pattern="#,##0.00;-#,##0.00" isBlankWhenNull="true">
 					<reportElement uuid="abae3006-9685-42e5-952b-15321d7f0063" x="732" y="2" width="29" height="9"/>