From 1b0b3b8f2355086a31a9be5ba2fe998070c33b8e Mon Sep 17 00:00:00 2001
From: walace <walace@d1611594-4594-4d17-8e1d-87c2c4800839>
Date: Tue, 24 Aug 2021 18:51:07 +0000
Subject: [PATCH] =?UTF-8?q?fixes=20bug#23074=20qua:=20dev:=20Incluido=20o?=
 =?UTF-8?q?=20campo=20de=20seguro=20opcional=20no=20relatorio=20forma=20de?=
 =?UTF-8?q?=20pagamento=20por=20ag=C3=AAncia,=20conforme=20spec.=20Evidenc?=
 =?UTF-8?q?ia=20em=20anexa?=
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@108473 d1611594-4594-4d17-8e1d-87c2c4800839
---
 .../impl/RelatorioFormaPagamentoAgencia.java  |   3 +
 ...latorioFormaPagamentoAgencia_es.properties |   1 +
 ...orioFormaPagamentoAgencia_pt_BR.properties |   1 +
 .../RelatorioFormaPagamentoAgencia.jasper     | Bin 37303 -> 39043 bytes
 .../RelatorioFormaPagamentoAgencia.jrxml      |  65 ++++++++++++------
 5 files changed, 49 insertions(+), 21 deletions(-)

diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioFormaPagamentoAgencia.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioFormaPagamentoAgencia.java
index 999461bf9..ca70f0654 100644
--- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioFormaPagamentoAgencia.java
+++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioFormaPagamentoAgencia.java
@@ -60,6 +60,7 @@ public class RelatorioFormaPagamentoAgencia extends RelatorioDemandas {
 		        sql.append(" SUM(CASE WHEN c.MOTIVOCANCELACION_ID IS NULL THEN 1 ELSE -1 END *(nvl(cfp.importe, 0) - nvl(c.importepedagio, 0) - nvl(c.importeseguro, 0) - nvl(c.importetaxaembarque, 0))) AS tarifa, ");
 		        sql.append(" SUM(CASE WHEN c.MOTIVOCANCELACION_ID IS NULL THEN 1 ELSE -1 END * nvl(c.importepedagio, 0)) AS pedagio, ");
 		        sql.append(" SUM(CASE WHEN c.MOTIVOCANCELACION_ID IS NULL THEN 1 ELSE -1 END * nvl(c.importeseguro, 0)) AS seguro, ");
+		        sql.append(" SUM(CASE WHEN c.MOTIVOCANCELACION_ID IS NULL THEN 1 ELSE -1 END * nvl(ee.impingreso, 0)) AS seguro_opcional, ");
 		        sql.append(" SUM(CASE WHEN c.MOTIVOCANCELACION_ID IS NULL THEN 1 ELSE -1 END * nvl(c.importetaxaembarque, 0)) AS taxa, ");
 		        sql.append(" SUM(CASE WHEN c.MOTIVOCANCELACION_ID IS NULL THEN 1 ELSE -1 END * nvl(cfp.importe, 0)) AS total, ");
 		        sql.append(" COUNT(c.preciopagado) AS qtde ");
@@ -68,6 +69,7 @@ public class RelatorioFormaPagamentoAgencia extends RelatorioDemandas {
 		        sql.append(" join forma_pago fp on cfp.formapago_id =  fp.formapago_id ");
 		        sql.append(" join punto_venta pv on pv.PUNTOVENTA_ID = c.PUNTOVENTA_ID ");
 		        sql.append(" join marca m on m.MARCA_ID = c.MARCA_ID and m.activo = 1 ");
+		        sql.append(" left join evento_extra ee on (ee.boleto_id = c.transacao_id and ee.activo = 1 ) ");
 		        sql.append(where);
 		        sql.append(" AND c.INDREIMPRESION = 0 ");
 		        sql.append(" group by to_char(c.fechorventa, 'dd/MM/yyyy'), pv.NOMBPUNTOVENTA, fp.DESCPAGO ");
@@ -86,6 +88,7 @@ public class RelatorioFormaPagamentoAgencia extends RelatorioDemandas {
 					dataResult.put("TARIFA", rset.getDouble("TARIFA"));
 					dataResult.put("PEDAGIO", rset.getDouble("PEDAGIO"));
 					dataResult.put("SEGURO", rset.getDouble("SEGURO"));
+					dataResult.put("SEGURO_OPCIONAL", rset.getDouble("SEGURO_OPCIONAL"));
 					dataResult.put("TAXA", rset.getDouble("TAXA"));
 					dataResult.put("TOTAL", rset.getDouble("TOTAL"));
 					dataResult.put("QTDE", rset.getInt("QTDE"));
diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioFormaPagamentoAgencia_es.properties b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioFormaPagamentoAgencia_es.properties
index c48020b34..c079735d2 100644
--- a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioFormaPagamentoAgencia_es.properties
+++ b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioFormaPagamentoAgencia_es.properties
@@ -9,6 +9,7 @@ FORMA_PAG = FORMA DE PAG.
 VALOR = TARIFA
 PEDAGIO = PEDÁGIO
 SEGURO = SEGURO
+SEGURO_OPCIONAL = SEGURO OPCIONAL
 TAXAS = TAXAS
 TOTAL = TOTAL
 QTDE = QTDE
diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioFormaPagamentoAgencia_pt_BR.properties b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioFormaPagamentoAgencia_pt_BR.properties
index c48020b34..c079735d2 100644
--- a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioFormaPagamentoAgencia_pt_BR.properties
+++ b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioFormaPagamentoAgencia_pt_BR.properties
@@ -9,6 +9,7 @@ FORMA_PAG = FORMA DE PAG.
 VALOR = TARIFA
 PEDAGIO = PEDÁGIO
 SEGURO = SEGURO
+SEGURO_OPCIONAL = SEGURO OPCIONAL
 TAXAS = TAXAS
 TOTAL = TOTAL
 QTDE = QTDE
diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioFormaPagamentoAgencia.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioFormaPagamentoAgencia.jasper
index fd80081eb18f4baad57729c50f45d9f4e2406f21..e275057817bf18c79933a801559a44cdecb0e9af 100644
GIT binary patch
literal 39043
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
ChjYmQ

delta 11842
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

diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioFormaPagamentoAgencia.jrxml b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioFormaPagamentoAgencia.jrxml
index 1b7dc509f..d225b097f 100644
--- a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioFormaPagamentoAgencia.jrxml
+++ b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioFormaPagamentoAgencia.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="relatorioFormaPagamentoAgencia" pageWidth="842" pageHeight="595" orientation="Landscape" whenNoDataType="NoDataSection" columnWidth="802" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20" isFloatColumnFooter="true" uuid="832cc8a2-6330-4063-9b36-f96514ae8283">
-	<property name="ireport.zoom" value="1.7715610000000088"/>
-	<property name="ireport.x" value="321"/>
+	<property name="ireport.zoom" value="2.143588810000011"/>
+	<property name="ireport.x" value="0"/>
 	<property name="ireport.y" value="0"/>
 	<parameter name="DATA_INICIAL" class="java.util.Date"/>
 	<parameter name="DATA_FINAL" class="java.util.Date"/>
@@ -19,6 +19,7 @@
 	<field name="TAXA" class="java.lang.Double"/>
 	<field name="TOTAL" class="java.lang.Double"/>
 	<field name="QTDE" class="java.lang.Integer"/>
+	<field name="SEGURO_OPCIONAL" class="java.lang.Double"/>
 	<variable name="PEDAGIO" class="java.lang.Double" calculation="Sum">
 		<variableExpression><![CDATA[$F{PEDAGIO}]]></variableExpression>
 	</variable>
@@ -37,6 +38,9 @@
 	<variable name="TARIFA" class="java.lang.Double" calculation="Sum">
 		<variableExpression><![CDATA[$F{TARIFA}]]></variableExpression>
 	</variable>
+	<variable name="SEGURO_OPCIONAL" class="java.lang.Double" calculation="Sum">
+		<variableExpression><![CDATA[$F{SEGURO_OPCIONAL}]]></variableExpression>
+	</variable>
 	<background>
 		<band splitType="Stretch"/>
 	</background>
@@ -57,7 +61,7 @@
 				<textFieldExpression><![CDATA[$R{TITULO}]]></textFieldExpression>
 			</textField>
 			<staticText>
-				<reportElement uuid="c45a1ecd-8b5e-4bd7-9139-56e0844cea7e" mode="Opaque" x="144" y="20" width="10" height="20" backcolor="#CCCCCC"/>
+				<reportElement uuid="c45a1ecd-8b5e-4bd7-9139-56e0844cea7e" mode="Opaque" x="144" y="20" width="54" height="20" backcolor="#CCCCCC"/>
 				<textElement>
 					<font isBold="true"/>
 				</textElement>
@@ -69,7 +73,7 @@
 				<textFieldExpression><![CDATA[$P{DATA_INICIAL}]]></textFieldExpression>
 			</textField>
 			<textField pattern="dd/MM/yyyy">
-				<reportElement uuid="3948e59f-21d8-47c8-8077-a57af30605c5" mode="Opaque" x="154" y="20" width="459" height="20" backcolor="#CCCCCC"/>
+				<reportElement uuid="3948e59f-21d8-47c8-8077-a57af30605c5" mode="Opaque" x="198" y="20" width="415" height="20" backcolor="#CCCCCC"/>
 				<textElement/>
 				<textFieldExpression><![CDATA[$P{DATA_FINAL}]]></textFieldExpression>
 			</textField>
@@ -108,35 +112,35 @@
 				<textFieldExpression><![CDATA[$R{DATA}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement uuid="29bb0167-21cd-401c-94d9-f94bb1e9b9e4" x="66" y="0" width="201" height="20"/>
+				<reportElement uuid="29bb0167-21cd-401c-94d9-f94bb1e9b9e4" x="66" y="0" width="132" height="20"/>
 				<textElement textAlignment="Center" markup="none">
 					<font isBold="true"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$R{AGENCIA}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement uuid="9457e696-5c75-4983-98c3-9dc4fc54e976" x="267" y="0" width="110" height="20"/>
+				<reportElement uuid="9457e696-5c75-4983-98c3-9dc4fc54e976" x="198" y="0" width="87" height="20"/>
 				<textElement textAlignment="Right" markup="none">
 					<font isBold="true"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$R{FORMA_PAG}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement uuid="ab54d7e9-29fd-42da-9721-07fe99bb8874" x="377" y="0" width="90" height="20"/>
+				<reportElement uuid="ab54d7e9-29fd-42da-9721-07fe99bb8874" x="285" y="0" width="69" height="20"/>
 				<textElement textAlignment="Right" markup="none">
 					<font isBold="true"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$R{VALOR}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement uuid="fafe4849-b6d5-4a20-ab2c-bb3551337bbd" x="467" y="0" width="78" height="20"/>
+				<reportElement uuid="fafe4849-b6d5-4a20-ab2c-bb3551337bbd" x="354" y="0" width="70" height="20"/>
 				<textElement textAlignment="Right" markup="none">
 					<font isBold="true"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$R{PEDAGIO}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement uuid="52cf4306-6208-414e-8892-3085a69fa84a" x="545" y="0" width="68" height="20"/>
+				<reportElement uuid="52cf4306-6208-414e-8892-3085a69fa84a" x="424" y="0" width="77" height="20"/>
 				<textElement textAlignment="Right" markup="none">
 					<font isBold="true"/>
 				</textElement>
@@ -160,12 +164,19 @@
 				<reportElement uuid="33fdc3c8-28af-450b-9afb-bffbe50ff8b8" x="1" y="20" width="801" height="1"/>
 			</line>
 			<textField>
-				<reportElement uuid="478182fa-9c5c-4e61-8719-e4b056b80585" x="740" y="0" width="49" height="20"/>
+				<reportElement uuid="478182fa-9c5c-4e61-8719-e4b056b80585" x="740" y="0" width="62" height="20"/>
 				<textElement textAlignment="Right" markup="none">
 					<font isBold="true"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$R{QTDE}]]></textFieldExpression>
 			</textField>
+			<textField>
+				<reportElement uuid="fd782db0-7497-4596-8ace-8adbd28b895a" x="501" y="0" width="112" height="20"/>
+				<textElement textAlignment="Center" markup="none">
+					<font isBold="true"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$R{SEGURO_OPCIONAL}]]></textFieldExpression>
+			</textField>
 		</band>
 	</columnHeader>
 	<detail>
@@ -176,17 +187,17 @@
 				<textFieldExpression><![CDATA[$F{DATA}]]></textFieldExpression>
 			</textField>
 			<textField isBlankWhenNull="true">
-				<reportElement uuid="151a46f2-5c54-4a0e-91c2-a49986a08cff" x="267" y="0" width="110" height="20" isPrintWhenDetailOverflows="true"/>
+				<reportElement uuid="151a46f2-5c54-4a0e-91c2-a49986a08cff" x="198" y="0" width="87" height="20" isPrintWhenDetailOverflows="true"/>
 				<textElement textAlignment="Right"/>
 				<textFieldExpression><![CDATA[$F{FORMA_PAGAMENTO}]]></textFieldExpression>
 			</textField>
 			<textField isBlankWhenNull="true">
-				<reportElement uuid="e873a0b8-5b07-4883-8be6-edf75307e9ab" x="66" y="0" width="201" height="20" isPrintWhenDetailOverflows="true"/>
+				<reportElement uuid="e873a0b8-5b07-4883-8be6-edf75307e9ab" x="66" y="0" width="132" height="20" isPrintWhenDetailOverflows="true"/>
 				<textElement textAlignment="Center"/>
 				<textFieldExpression><![CDATA[$F{AGENCIA}]]></textFieldExpression>
 			</textField>
 			<textField pattern="#,##0.00" isBlankWhenNull="true">
-				<reportElement uuid="d2f490c1-e807-4243-a3e0-b86229a83c6b" x="377" y="0" width="90" height="20" isPrintWhenDetailOverflows="true"/>
+				<reportElement uuid="d2f490c1-e807-4243-a3e0-b86229a83c6b" x="285" y="0" width="69" height="20" isPrintWhenDetailOverflows="true"/>
 				<textElement textAlignment="Right"/>
 				<textFieldExpression><![CDATA[$F{TARIFA}]]></textFieldExpression>
 			</textField>
@@ -196,17 +207,17 @@
 				<textFieldExpression><![CDATA[$F{TOTAL}]]></textFieldExpression>
 			</textField>
 			<textField isBlankWhenNull="true">
-				<reportElement uuid="acacd737-9c59-4893-ac3a-ab43c1909a69" x="740" y="0" width="49" height="20" isPrintWhenDetailOverflows="true"/>
+				<reportElement uuid="acacd737-9c59-4893-ac3a-ab43c1909a69" x="740" y="0" width="62" height="20" isPrintWhenDetailOverflows="true"/>
 				<textElement textAlignment="Right"/>
 				<textFieldExpression><![CDATA[$F{QTDE}]]></textFieldExpression>
 			</textField>
 			<textField pattern="#,##0.00" isBlankWhenNull="true">
-				<reportElement uuid="a3119d26-2d10-40c5-98dc-bf0f6be3fc25" x="467" y="0" width="78" height="20" isPrintWhenDetailOverflows="true"/>
+				<reportElement uuid="a3119d26-2d10-40c5-98dc-bf0f6be3fc25" x="354" y="0" width="70" height="20" isPrintWhenDetailOverflows="true"/>
 				<textElement textAlignment="Right"/>
 				<textFieldExpression><![CDATA[$F{PEDAGIO}]]></textFieldExpression>
 			</textField>
 			<textField pattern="#,##0.00" isBlankWhenNull="true">
-				<reportElement uuid="ccad4f84-243a-47cf-904a-15c4ba7feee4" x="545" y="0" width="68" height="20" isPrintWhenDetailOverflows="true"/>
+				<reportElement uuid="ccad4f84-243a-47cf-904a-15c4ba7feee4" x="424" y="0" width="77" height="20" isPrintWhenDetailOverflows="true"/>
 				<textElement textAlignment="Right"/>
 				<textFieldExpression><![CDATA[$F{SEGURO}]]></textFieldExpression>
 			</textField>
@@ -215,6 +226,11 @@
 				<textElement textAlignment="Right"/>
 				<textFieldExpression><![CDATA[$F{TAXA}]]></textFieldExpression>
 			</textField>
+			<textField pattern="#,##0.00" isBlankWhenNull="true">
+				<reportElement uuid="48f4dece-76dc-4445-89f3-73c0537c8bf9" x="501" y="0" width="112" height="20" isPrintWhenDetailOverflows="true"/>
+				<textElement textAlignment="Center"/>
+				<textFieldExpression><![CDATA[$F{SEGURO_OPCIONAL}]]></textFieldExpression>
+			</textField>
 		</band>
 	</detail>
 	<columnFooter>
@@ -226,21 +242,21 @@
 	<summary>
 		<band height="50">
 			<staticText>
-				<reportElement uuid="23836f01-2215-4ba5-8d68-59a493e7f45a" x="267" y="8" width="110" height="20"/>
+				<reportElement uuid="23836f01-2215-4ba5-8d68-59a493e7f45a" x="198" y="8" width="87" height="20"/>
 				<textElement textAlignment="Right">
 					<font isBold="true"/>
 				</textElement>
 				<text><![CDATA[Total]]></text>
 			</staticText>
 			<textField pattern="#,##0.00" isBlankWhenNull="true">
-				<reportElement uuid="26a2768f-98c4-40d6-8437-a3431e29767d" x="506" y="8" width="107" height="20"/>
+				<reportElement uuid="26a2768f-98c4-40d6-8437-a3431e29767d" x="424" y="8" width="77" height="20"/>
 				<textElement textAlignment="Right" verticalAlignment="Middle">
 					<font isBold="true"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$V{SEGURO}]]></textFieldExpression>
 			</textField>
 			<textField pattern="#,##0.00" isBlankWhenNull="true">
-				<reportElement uuid="c3d56b38-e963-4eb8-8c1d-631bc26d3c68" x="467" y="8" width="78" height="20"/>
+				<reportElement uuid="c3d56b38-e963-4eb8-8c1d-631bc26d3c68" x="354" y="8" width="70" height="20"/>
 				<textElement textAlignment="Right" verticalAlignment="Middle">
 					<font isBold="true"/>
 				</textElement>
@@ -261,7 +277,7 @@
 				<textFieldExpression><![CDATA[$V{TOTAL}]]></textFieldExpression>
 			</textField>
 			<textField pattern="###0" isBlankWhenNull="true">
-				<reportElement uuid="bdbb35f4-3d9d-4dcb-a849-30bb1ce38361" x="740" y="8" width="49" height="20"/>
+				<reportElement uuid="bdbb35f4-3d9d-4dcb-a849-30bb1ce38361" x="740" y="8" width="62" height="20"/>
 				<textElement textAlignment="Right" verticalAlignment="Middle">
 					<font isBold="true"/>
 				</textElement>
@@ -271,12 +287,19 @@
 				<reportElement uuid="29cf051d-d1b2-4744-932b-9e8adb6b254d" x="1" y="5" width="801" height="1"/>
 			</line>
 			<textField pattern="#,##0.00" isBlankWhenNull="true">
-				<reportElement uuid="6b7dcb42-1af8-4243-89d7-50d6bf0d9ba5" x="377" y="8" width="90" height="20"/>
+				<reportElement uuid="6b7dcb42-1af8-4243-89d7-50d6bf0d9ba5" x="285" y="8" width="69" height="20"/>
 				<textElement textAlignment="Right" verticalAlignment="Middle">
 					<font isBold="true"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$V{TARIFA}]]></textFieldExpression>
 			</textField>
+			<textField pattern="#,##0.00" isBlankWhenNull="true">
+				<reportElement uuid="993c02bc-fc54-4efc-bd4a-5fd5f3226937" x="501" y="8" width="112" height="20"/>
+				<textElement textAlignment="Center" verticalAlignment="Middle">
+					<font isBold="true"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$V{SEGURO_OPCIONAL}]]></textFieldExpression>
+			</textField>
 		</band>
 	</summary>
 	<noData>