From 8b835a07049d169f74ee1bbb261aae1728145ce7 Mon Sep 17 00:00:00 2001
From: "guilherme.lopes" <guilherme.lopes@d1611594-4594-4d17-8e1d-87c2c4800839>
Date: Fri, 6 Mar 2020 14:07:52 +0000
Subject: [PATCH] =?UTF-8?q?fixes=20bug#18345=20dev:fabio.faria=20qua:D?=
 =?UTF-8?q?=C3=A9bora=20Ajustes=20na=20ordena=C3=A7=C3=A3o=20na=20consulta?=
 =?UTF-8?q?=20e=20acrescentei=20no=20nome=20da=20linha=20o=20valor=20Ida?=
 =?UTF-8?q?=20ou=20Volta.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@100544 d1611594-4594-4d17-8e1d-87c2c4800839
---
 .../RelatorioResumoLinhasAnalitico.jasper     | Bin 114527 -> 114873 bytes
 .../RelatorioResumoLinhasAnalitico.jrxml      |  26 ++++++++++--------
 2 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioResumoLinhasAnalitico.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioResumoLinhasAnalitico.jasper
index ac17ab998d2b6c531ebbacad05d23f2029b0a7c3..f7d3116e80cd538500552d6b4ce092dfd1e3913a 100644
GIT binary patch
delta 14843
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
bJv-<HIigvMAw~0wCMD0BQ9S+GDYO3r_Z;Ec

delta 14806
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
P$5Jh7eMfzLt!VXMPPchn

diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioResumoLinhasAnalitico.jrxml b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioResumoLinhasAnalitico.jrxml
index 34fe73333..bd0c10a1b 100644
--- a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioResumoLinhasAnalitico.jrxml
+++ b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioResumoLinhasAnalitico.jrxml
@@ -1,8 +1,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="RelatorioResumoLinhas" pageWidth="842" pageHeight="595" orientation="Landscape" whenNoDataType="NoDataSection" columnWidth="802" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20" isFloatColumnFooter="true" uuid="efbc89d4-6f08-4ea5-802f-d4f48ed208e2">
-	<property name="ireport.zoom" value="1.7715610000000084"/>
+	<property name="ireport.zoom" value="3.138428376721017"/>
 	<property name="ireport.x" value="0"/>
-	<property name="ireport.y" value="0"/>
+	<property name="ireport.y" value="332"/>
 	<style name="textStyle" isDefault="true" fontSize="6" isBold="false" isItalic="false" isUnderline="false" isStrikeThrough="false"/>
 	<style name="table">
 		<box>
@@ -48,7 +48,7 @@
 
 FROM (
 
-SELECT TAB.RUTA_ID, TAB.NUMRUTA, TAB.DESCRUTA, TAB.TARIFA, TAB.ASSENTOS, TAB.ROLOPERATIVO_ID,
+SELECT TAB.INDSENTIDOIDA, TAB.RUTA_ID, TAB.NUMRUTA, TAB.DESCRUTA, TAB.TARIFA, TAB.ASSENTOS, TAB.ROLOPERATIVO_ID,
 TAB.INTERESTADUAL, TAB.GRUPO_LINHA, TAB.EXTENSAO_KM, TAB.CVE_CLASE_SERVICIO,
 SUM(NVL(TAB.RECEITA_SEGURO,0)) AS RECEITA_SEGURO, SUM(NVL(TAB.RECEITA_BAGAGEM,0)) AS RECEITA_BAGAGEM,
 SUM(NVL(TAB.RECEITA_SEGURO_OUTROS,0)) AS RECEITA_SEGURO_OUTROS, SUM(NVL(TAB.RECEITA_TARIFA,0)) AS RECEITA_TARIFA,
@@ -71,9 +71,10 @@ FROM (SELECT TAB1.*,
                          GROUP BY CO.FECCORRIDA, CO.RUTA_ID, BO.PRECIOBASE, BO.NUMKMVIAJE) PE
                  WHERE PE.FECCORRIDA = TAB1.FECCORRIDA AND PE.RUTA_ID = TAB1.RUTA_ID) PASSAGEIROS_EQUIVALENTE
           FROM (SELECT RT.RUTA_ID,
+		  RT.INDSENTIDOIDA,
                        RT.NUMRUTA,
                        CR.FECCORRIDA,
-                       RT.DESCRUTA DESCRUTA,
+                       CONCAT(RT.DESCRUTA, CASE WHEN RT.INDSENTIDOIDA = 0 THEN ' - VOLTA' ELSE ' - IDA' END) DESCRUTA,
                        TF.PRECIO TARIFA,
                        DA.CANTASIENTOS ASSENTOS,
                        RO.ROLOPERATIVO_ID,
@@ -143,9 +144,10 @@ FROM (SELECT TAB1.*,
                           RO.ROLOPERATIVO_ID,
                           GR.DESCGRUPO,
                           CO.ESTADO_ID,
-                          CD.ESTADO_ID) TAB1) TAB
+                          CD.ESTADO_ID,
+		     RT.INDSENTIDOIDA) TAB1) TAB
 GROUP BY TAB.RUTA_ID, TAB.NUMRUTA, TAB.DESCRUTA, TAB.TARIFA, TAB.ASSENTOS, TAB.ROLOPERATIVO_ID,
-TAB.INTERESTADUAL, TAB.GRUPO_LINHA, TAB.EXTENSAO_KM, TAB.CVE_CLASE_SERVICIO) SUB
+TAB.INTERESTADUAL, TAB.GRUPO_LINHA, TAB.EXTENSAO_KM, TAB.CVE_CLASE_SERVICIO, TAB.INDSENTIDOIDA) SUB
 WHERE
     (DECODE(NVL(SUB.VIAGENS_TOTAL,0), 0, 1, NVL(SUB.VIAGENS_TOTAL,0)) != 0)
     AND DECODE(NVL(SUB.VIAGENS_TOTAL,0), 0, 1, NVL(SUB.VIAGENS_TOTAL,0)) != 0
@@ -154,7 +156,7 @@ WHERE
     AND DECODE(NVL(SUB.VIAGENS_TOTAL,0), 0, 1, NVL(SUB.VIAGENS_TOTAL,0)) != 0
     AND DECODE(NVL(SUB.TARIFA,0), 0, 1, NVL(SUB.TARIFA,0)) != 0
     AND (NVL(SUB.ASSENTOS,0) * NVL(SUB.KM_RODADO,0)) != 0
-    ]]>
+ORDER BY SUB.DESCRUTA, SUB.INDSENTIDOIDA, SUB.ASSENTOS, SUB.TARIFA]]>
 	</queryString>
 	<field name="RUTA_ID" class="java.math.BigDecimal"/>
 	<field name="NUMRUTA" class="java.lang.String"/>
@@ -746,14 +748,14 @@ WHERE
 	<columnHeader>
 		<band height="32" splitType="Stretch">
 			<staticText>
-				<reportElement uuid="69af5fee-1749-41a5-bf3d-e53db355ddd2" x="0" y="16" width="25" height="14"/>
+				<reportElement uuid="69af5fee-1749-41a5-bf3d-e53db355ddd2" x="0" y="16" width="15" height="14"/>
 				<textElement textAlignment="Right" verticalAlignment="Middle">
 					<font size="6"/>
 				</textElement>
 				<text><![CDATA[Cod.]]></text>
 			</staticText>
 			<staticText>
-				<reportElement uuid="f39411fa-dfc8-4b51-a705-53b2ed781e10" mode="Transparent" x="25" y="16" width="131" height="14" forecolor="#000000" backcolor="#FFFFFF"/>
+				<reportElement uuid="f39411fa-dfc8-4b51-a705-53b2ed781e10" mode="Transparent" x="15" y="16" width="131" height="14" forecolor="#000000" backcolor="#FFFFFF"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle" rotation="None" markup="none">
 					<font fontName="SansSerif" size="6" isBold="false" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
 					<paragraph lineSpacing="Single"/>
@@ -987,16 +989,16 @@ WHERE
 		</band>
 	</columnHeader>
 	<detail>
-		<band height="9" splitType="Stretch">
+		<band height="16" splitType="Stretch">
 			<textField isBlankWhenNull="true">
-				<reportElement uuid="3806ad9e-a061-446b-b913-8e5154e42c17" x="0" y="0" width="25" height="9"/>
+				<reportElement uuid="3806ad9e-a061-446b-b913-8e5154e42c17" x="0" y="0" width="15" height="9"/>
 				<textElement textAlignment="Right" verticalAlignment="Middle">
 					<font size="5"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{NUMRUTA}]]></textFieldExpression>
 			</textField>
 			<textField isBlankWhenNull="true">
-				<reportElement uuid="9c07acec-d267-4686-b7b0-edbb1899fc95" x="25" y="0" width="131" height="9"/>
+				<reportElement uuid="9c07acec-d267-4686-b7b0-edbb1899fc95" x="15" y="0" width="141" height="16"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle"/>
 				<textFieldExpression><![CDATA[$F{DESCRUTA}]]></textFieldExpression>
 			</textField>