From 7991d4ec211a95fb6d5d935f719530b5174a0926 Mon Sep 17 00:00:00 2001
From: walace <walace@d1611594-4594-4d17-8e1d-87c2c4800839>
Date: Wed, 12 Sep 2018 17:32:03 +0000
Subject: [PATCH] =?UTF-8?q?agrupado=20por=20autoriza=C3=A7=C3=A3o?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

fixes bug#11948
dev:wallace
qua:wallace

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@85275 d1611594-4594-4d17-8e1d-87c2c4800839
---
 .../impl/RelatorioVendasCartoes.java          |  24 +++++++++---------
 .../templates/RelatorioVendasCartoes.jasper   | Bin 37115 -> 37213 bytes
 .../templates/RelatorioVendasCartoes.jrxml    |  24 +++++++++---------
 3 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioVendasCartoes.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioVendasCartoes.java
index 6d92e32f9..5a4555cc5 100644
--- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioVendasCartoes.java
+++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioVendasCartoes.java
@@ -17,6 +17,7 @@ import com.rjconsultores.ventaboletos.entidad.Usuario;
 import com.rjconsultores.ventaboletos.relatorios.utilitarios.DataSource;
 import com.rjconsultores.ventaboletos.relatorios.utilitarios.Relatorio;
 import com.rjconsultores.ventaboletos.relatorios.utilitarios.RelatorioVendasCartoesBean;
+import com.rjconsultores.ventaboletos.utilerias.DateUtil;
 import com.rjconsultores.ventaboletos.web.utilerias.NamedParameterStatement;
 
 import net.sf.jasperreports.engine.data.JRBeanCollectionDataSource;
@@ -78,11 +79,11 @@ public class RelatorioVendasCartoes extends Relatorio {
 						
 						RelatorioVendasCartoesBean bean = new RelatorioVendasCartoesBean();
 						
-						bean.setDataVenda(rset.getDate("dataVenda"));
-						bean.setDataOperacao(rset.getDate("dataOperacao"));
-						bean.setDescPagamento(rset.getString("descPagamento"));
-						bean.setValor(rset.getBigDecimal("valor"));
-						bean.setAutorizacao(rset.getString("autorizacao"));
+						bean.setDataVenda(rset.getString("dataVenda") != null ? DateUtil.getDateFromString(rset.getString("dataVenda"), "ddMMyy") : null);
+						bean.setDataOperacao(rset.getString("dataOperacao")  != null ?  DateUtil.getDateFromString(rset.getString("dataOperacao"), "ddMMyy") : null);
+						bean.setDescPagamento(rset.getString("descPagamento") != null ?  rset.getString("descPagamento") : null);
+						bean.setValor(rset.getBigDecimal("valor") != null ?  rset.getBigDecimal("valor") : null);
+						bean.setAutorizacao(rset.getString("autorizacao") != null ?  rset.getString("autorizacao") : null);
 						bean.setQtdParcelas(rset.getInt("qtdParcelas"));
 						
 						valorTotal = valorTotal.add(bean.getValor() != null ? bean.getValor() : BigDecimal.ZERO);
@@ -121,10 +122,10 @@ public class RelatorioVendasCartoes extends Relatorio {
 		StringBuilder sb = new StringBuilder();
 		
 		sb.append("SELECT caja.descpago as descPagamento,");
-		sb.append("       caja.dataoperacao as dataOperacao,");
+		sb.append("       to_char(caja.dataoperacao, 'ddMMyy') as dataOperacao,");
 		sb.append("       caja.autorizacao as autorizacao,");
 		sb.append("       caja.qtdparcelas as qtdParcelas,");
-		sb.append("       caja.datavenda as dataVenda, ");
+		sb.append("       to_char(caja.datavenda, 'ddMMyy') as dataVenda, ");
 		sb.append("       sum(caja.preco) as valor ");
 		sb.append("FROM");
 		sb.append("  (SELECT fp.descpago AS descpago,");
@@ -132,7 +133,7 @@ public class RelatorioVendasCartoes extends Relatorio {
 		sb.append("          ct.numautorizacion AS autorizacao,");
 		sb.append("          ct.cantparcelas AS qtdparcelas,");
 		sb.append("          c.fechorventa AS datavenda,");
-		sb.append("          c.preciopagado AS preco");
+		sb.append("          cfp.importe AS preco");
 		sb.append("   FROM caja c");
 		sb.append("   INNER JOIN caja_formapago cfp ON c.caja_id=cfp.caja_id");
 		sb.append("   AND cfp.activo = 1");
@@ -168,12 +169,11 @@ public class RelatorioVendasCartoes extends Relatorio {
 		sb.append("     AND fp.formapago_id IN(2,3)");
 		sb.append("     AND c.activo = 1) caja ");
 		sb.append("GROUP BY caja.descpago,");
-		sb.append("         caja.dataoperacao,");
+		sb.append("         to_char(caja.dataoperacao, 'ddMMyy'),");
 		sb.append("         caja.autorizacao,");
 		sb.append("         caja.qtdparcelas,");
-		sb.append("         caja.datavenda,");
-		sb.append("         caja.preco ");
-		sb.append("ORDER BY caja.descpago, caja.datavenda");
+		sb.append("         to_char(caja.datavenda, 'ddMMyy') ");
+		sb.append("ORDER BY caja.descpago, to_char(caja.datavenda, 'ddMMyy')");
 		
 		return sb.toString();
 	}
diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioVendasCartoes.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioVendasCartoes.jasper
index 07e1049cbd23b97e263e154e69c4c2198ec36255..01384e0ddb83ce2d6bf2afd21103903e27410727 100644
GIT binary patch
delta 4828
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
F{Xc9M(l-DA

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

diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioVendasCartoes.jrxml b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioVendasCartoes.jrxml
index 76b333f95..e352c78d0 100644
--- a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioVendasCartoes.jrxml
+++ b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioVendasCartoes.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="RelatorioVendasCartoes" 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="4.177248169415656"/>
-	<property name="ireport.x" value="1210"/>
-	<property name="ireport.y" value="192"/>
+	<property name="ireport.x" value="2573"/>
+	<property name="ireport.y" value="78"/>
 	<parameter name="NOMBEMPRESA" class="java.lang.String"/>
 	<parameter name="DATA_INICIAL" class="java.lang.String">
 		<defaultValueExpression><![CDATA[]]></defaultValueExpression>
@@ -73,8 +73,8 @@
 					</textElement>
 					<textFieldExpression><![CDATA[$V{total_group}]]></textFieldExpression>
 				</textField>
-				<textField pattern="¤ #,##0.00" isBlankWhenNull="true">
-					<reportElement x="648" y="1" width="77" height="23" uuid="b3279060-d361-41c6-bc5c-a02d9d08774c"/>
+				<textField pattern="#,##0.00" isBlankWhenNull="true">
+					<reportElement x="648" y="1" width="132" height="23" uuid="b3279060-d361-41c6-bc5c-a02d9d08774c"/>
 					<textElement textAlignment="Right">
 						<font size="10"/>
 					</textElement>
@@ -132,7 +132,7 @@
 				<reportElement x="0" y="60" width="802" height="1" uuid="27a77abc-db13-4836-9261-8208f3825802"/>
 			</line>
 			<textField>
-				<reportElement x="0" y="61" width="802" height="20" uuid="06a43567-1fd2-4c86-a0cc-443618ddf965"/>
+				<reportElement x="0" y="61" width="780" height="20" uuid="06a43567-1fd2-4c86-a0cc-443618ddf965"/>
 				<textElement>
 					<font size="11"/>
 				</textElement>
@@ -170,7 +170,7 @@
 				<textFieldExpression><![CDATA[$R{detail.dataVenda}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement x="480" y="86" width="276" height="23" uuid="c5d483c4-89a2-4724-ad57-731676551f0f"/>
+				<reportElement x="480" y="86" width="300" height="23" uuid="c5d483c4-89a2-4724-ad57-731676551f0f"/>
 				<textElement textAlignment="Right" markup="none">
 					<font size="12" isBold="true"/>
 				</textElement>
@@ -181,7 +181,7 @@
 				<textElement>
 					<font size="12"/>
 				</textElement>
-				<textFieldExpression><![CDATA[$P{DATA_INICIAL} + "  a  " + $P{DATA_FINAL} ]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$P{DATA_INICIAL} + "  a  " + $P{DATA_FINAL}]]></textFieldExpression>
 			</textField>
 		</band>
 	</pageHeader>
@@ -190,8 +190,8 @@
 	</columnHeader>
 	<detail>
 		<band height="15" splitType="Stretch">
-			<textField pattern="¤ #,##0.00" isBlankWhenNull="true">
-				<reportElement x="648" y="0" width="108" height="15" uuid="80a57c70-9f34-49b9-86f9-14bb27c462ca"/>
+			<textField pattern="#,##0.00" isBlankWhenNull="true">
+				<reportElement x="648" y="0" width="132" height="15" uuid="80a57c70-9f34-49b9-86f9-14bb27c462ca"/>
 				<textElement textAlignment="Right">
 					<font size="10"/>
 				</textElement>
@@ -248,8 +248,8 @@
 			<line>
 				<reportElement positionType="Float" x="0" y="0" width="803" height="1" uuid="d9792af6-b583-4b6e-bb69-7edd7f78fdfa"/>
 			</line>
-			<textField pattern="¤ #,##0.00" isBlankWhenNull="true">
-				<reportElement x="648" y="1" width="77" height="21" uuid="7ef31b82-e8a2-4baa-821a-174d5ca113fe"/>
+			<textField pattern="#,##0.00" isBlankWhenNull="true">
+				<reportElement x="648" y="1" width="132" height="21" uuid="7ef31b82-e8a2-4baa-821a-174d5ca113fe"/>
 				<textElement textAlignment="Right">
 					<font size="10"/>
 				</textElement>
@@ -260,7 +260,7 @@
 	<noData>
 		<band height="20">
 			<textField>
-				<reportElement x="0" y="0" width="791" height="20" uuid="3429e199-e682-4e28-b2ce-1bc9f2d031b2"/>
+				<reportElement x="0" y="0" width="780" height="20" uuid="3429e199-e682-4e28-b2ce-1bc9f2d031b2"/>
 				<textFieldExpression><![CDATA[$R{msg.noData}]]></textFieldExpression>
 			</textField>
 		</band>