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

fixes bug#13439 

dev:Valdevir
qua:Juliana


git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@90334 d1611594-4594-4d17-8e1d-87c2c4800839
master
valdevir 2019-02-27 19:39:21 +00:00
parent e6257ad2a2
commit b7c1c92d2e
8 changed files with 330 additions and 143 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioDepositos.java
View File

@ -9,14 +9,14 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import net.sf.jasperreports.engine.data.JRBeanCollectionDataSource;
import org.apache.log4j.Logger;
import com.rjconsultores.ventaboletos.relatorios.utilitarios.DataSource;
import com.rjconsultores.ventaboletos.relatorios.utilitarios.Relatorio;
import com.rjconsultores.ventaboletos.relatorios.utilitarios.RelatorioDepositoBean;
import net.sf.jasperreports.engine.data.JRBeanCollectionDataSource;
public class RelatorioDepositos extends Relatorio {
private static Logger log = Logger.getLogger(RelatorioDepositos.class);
@ -38,6 +38,7 @@ public class RelatorioDepositos extends Relatorio {
Integer puntoventaId = parametros.get("puntoventaId") != null ? Integer.parseInt(parametros.get("puntoventaId").toString()) : null;
Integer empresaId = parametros.get("empresaId") != null ? Integer.parseInt(parametros.get("empresaId").toString()) : null;
Boolean filtrarPendentes = parametros.get("filtrarPendentes") != null ? Boolean.parseBoolean(parametros.get("filtrarPendentes").toString()) : false;
Boolean isClassificaPorBanco = parametros.get("isClassificaPorBanco") != null ? Boolean.parseBoolean(parametros.get("isClassificaPorBanco").toString()) : false;
String fecInicio = parametros.get("fecInicio").toString() + " 00:00:00";
String fecFinal = parametros.get("fecFinal").toString() + " 23:59:59";
@ -66,6 +67,11 @@ public class RelatorioDepositos extends Relatorio {
deposito.setVrdeposito(rs.getBigDecimal(6));
deposito.setVrfechamento(rs.getBigDecimal(7));
deposito.setNumdeposito(rs.getString(8));
// Se checkbox não estiver marcado não preenche este campo e relatório não irá agrupar por nome banco
if (isClassificaPorBanco) {
deposito.setCodigoInstFinanceira(rs.getString(9));
deposito.setNomeInstFinanceira(rs.getString(10));
}
lsDadosRelatorio.add(deposito);
}
@ -100,15 +106,9 @@ public class RelatorioDepositos extends Relatorio {
sql.append(" tmp.saldo, ");
sql.append(" tmp.vrfechamento, ");
sql.append(" tmp.vrdeposito, ");
sql.append(" COALESCE( ");
sql.append(" (SELECT UNIQUE LISTAGG( fdep.NUMDEPOSITO, '/') WITHIN GROUP ( ");
sql.append(" ORDER BY fdep.NUMDEPOSITO) as NUMDEPOSITO ");
sql.append(" FROM fechamento_cntcorrente fcnt ");
sql.append(" LEFT JOIN Fechamento_deposito fdep ");
sql.append(" ON fcnt.FECHAMENTOCNTCORRENTE_ID = fdep.FECHAMENTOCNTCORRENTE_ID ");
sql.append(" WHERE fcnt.FECHAMENTOCNTCORRENTE_ID = tmp.FECHAMENTOCNTCORRENTE_ID ");
sql.append(" GROUP BY fcnt.FECHAMENTOCNTCORRENTE_ID ");
sql.append(" ), ' ') AS numdeposito ");
sql.append(" tmp.numdeposito, ");
sql.append(" tmp.codinstfin, ");
sql.append(" tmp.nomeinstfin ");
sql.append(" FROM ");
sql.append(" ( SELECT DISTINCT e.nombempresa, ");
sql.append(" p.nombpuntoventa, ");
@ -117,16 +117,30 @@ public class RelatorioDepositos extends Relatorio {
sql.append(" ( SUM(NVL(fd.valor_pago,0)) - f.total ) AS saldo, ");
sql.append(" SUM(NVL(fd.valor_pago,0)) AS vrfechamento , ");
sql.append(" f.total AS vrdeposito, ");
sql.append(" fd.FECHAMENTOCNTCORRENTE_ID ");
sql.append(" f.FECHAMENTOCNTCORRENTE_ID, ");
sql.append(" fdp.NUMDEPOSITO as numdeposito, ");
sql.append(" ifin.CODIGO as codinstfin, ");
sql.append(" ifin.NOME as nomeinstfin ");
sql.append(" FROM fechamento_cntcorrente f ");
sql.append(" INNER JOIN punto_venta p ");
// Join com PuntoVenta
sql.append(" LEFT JOIN punto_venta p ");
sql.append(" ON p.puntoventa_id = f.puntoventa_id ");
sql.append(" INNER JOIN empresa e ");
// Join com empresa
sql.append(" LEFT JOIN empresa e ");
sql.append(" ON e.empresa_id = f.empresa_id ");
// Join com fechamento_cct_deposito
sql.append(" LEFT JOIN fechamento_cct_deposito fd ");
sql.append(" ON fd.fechamentocntcorrente_id = f.fechamentocntcorrente_id ");
sql.append(" AND fd.activo = 1 ");
sql.append(" WHERE f.fecfechamento BETWEEN ? AND ?");
// Join com FECHAMENTO_DEPOSITO
sql.append(" LEFT JOIN FECHAMENTO_DEPOSITO fdp ");
sql.append(" ON fdp.FECHAMENTODEPOSITO_ID = fd.FECHAMENTODEPOSITO_ID ");
// Join com empresa_contabancaria
sql.append(" LEFT JOIN empresa_contabancaria ecb ");
sql.append(" ON ecb.EMPRESACONTABANCARIA_ID = fdp.EMPRESACONTABANCARIA_ID ");
// Join com INSTI_FINANCEIRA
sql.append(" LEFT JOIN INSTI_FINANCEIRA ifin ");
sql.append(" ON ifin.INSTIFINANCEIRA_ID = ecb.INSTIFINANCEIRA_ID ");
sql.append(" WHERE f.fecfechamento BETWEEN ? AND ? ");
sql.append(" AND f.activo = 1 ");
if (puntoVentaId != null){
@ -135,23 +149,24 @@ public class RelatorioDepositos extends Relatorio {
if (empresaId != null){
sql.append(" and e.empresa_id = " + empresaId);
}
sql.append(" GROUP BY e.nombempresa, ");
sql.append(" p.nombpuntoventa, ");
sql.append(" p.numpuntoventa, ");
sql.append(" f.fecfechamento, ");
sql.append(" fd.FECHAMENTOCNTCORRENTE_ID, ");
sql.append(" f.total ) tmp ");
sql.append(" f.FECHAMENTOCNTCORRENTE_ID, ");
sql.append(" f.total, ");
sql.append(" fdp.NUMDEPOSITO, ");
sql.append(" ifin.CODIGO, ");
sql.append(" ifin.NOME ) tmp ");
if (filtrarPendentes){
sql.append(" where ");
sql.append(" tmp.saldo < tmp.vrdeposito and tmp.saldo <> 0");
}
sql.append(" ORDER BY tmp.nombempresa, ");
sql.append(" tmp.nomeinstfin, ");
sql.append(" tmp.nombpuntoventa, ");
sql.append(" tmp.dtmotivo, ");
sql.append(" tmp.vrdeposito ");
return sql.toString();
}
}

3
src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioDepositos_es .properties
View File

@ -9,7 +9,8 @@ header.banco=Banco
header.numdeposito=Nº Depósito
header.dataDeposito=Data
header.valorDeposito=Valor
header.empresa=Empresa:
header.data=Período:
header.agencia=Agência
header.dtmotivo=Data Fechamento
header.saldo=Pendente

3
src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioDepositos_pt_BR.properties
View File

@ -9,7 +9,8 @@ header.banco=Banco
header.numdeposito=Nº Depósito
header.dataDeposito=Data
header.valorDeposito=Valor
header.empresa=Empresa:
header.data=Período:
header.agencia=Agência
header.dtmotivo=Data Fechamento
header.saldo=Pendente

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

Binary file not shown.

293
src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioDepositos.jrxml
View File

@ -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="RelatorioDepositos" pageWidth="595" pageHeight="842" whenNoDataType="NoDataSection" columnWidth="555" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20" whenResourceMissingType="Empty" uuid="65274c35-4f3f-4196-bd84-f042e9ac12ea">
<property name="ireport.zoom" value="2.5937424601000028"/>
<property name="ireport.x" value="715"/>
<property name="ireport.y" value="118"/>
<property name="ireport.zoom" value="1.3636363636363644"/>
<property name="ireport.x" value="0"/>
<property name="ireport.y" value="26"/>
<parameter name="fecInicio" class="java.lang.String">
<defaultValueExpression><![CDATA[]]></defaultValueExpression>
</parameter>
@ -19,6 +19,8 @@
<field name="vrfechamento" class="java.math.BigDecimal"/>
<field name="numdeposito" class="java.lang.String"/>
<field name="numpuntoventa" class="java.lang.String"/>
<field name="nomeInstFinanceira" class="java.lang.String"/>
<field name="codigoInstFinanceira" class="java.lang.String"/>
<variable name="TOTAL_DEPOSITOS" class="java.math.BigDecimal" calculation="Sum">
<variableExpression><![CDATA[$F{vrdeposito}]]></variableExpression>
</variable>
@ -28,15 +30,50 @@
<variable name="TOTAL_SALDO" class="java.math.BigDecimal" calculation="Sum">
<variableExpression><![CDATA[$F{saldo}]]></variableExpression>
</variable>
<variable name="DEPOSITO_BANCO" class="java.math.BigDecimal" resetType="Group" resetGroup="grupoBanco" calculation="Sum">
<variableExpression><![CDATA[$F{vrdeposito}]]></variableExpression>
</variable>
<variable name="VLFECHAMENTO_BANCO" class="java.math.BigDecimal" resetType="Group" resetGroup="grupoBanco" calculation="Sum">
<variableExpression><![CDATA[$F{vrfechamento}]]></variableExpression>
</variable>
<variable name="PENDENTE_BANCO" class="java.math.BigDecimal" resetType="Group" resetGroup="grupoBanco" calculation="Sum">
<variableExpression><![CDATA[$F{saldo}]]></variableExpression>
</variable>
<group name="empresa">
<groupExpression><![CDATA[$F{nombempresa}]]></groupExpression>
<groupHeader>
<band height="50">
<rectangle>
<reportElement stretchType="RelativeToTallestObject" x="1" y="28" width="554" height="22" isPrintWhenDetailOverflows="true" backcolor="#CCCCCC" uuid="03834106-1480-4ae2-9dc7-23a4dcf9abd6"/>
</rectangle>
<band height="20">
<textField>
<reportElement x="0" y="0" width="65" height="20" uuid="97c1f585-395c-487e-bcbd-3a1260f47c9c"/>
<textElement>
<font size="8" isBold="true"/>
<paragraph lineSpacing="Single"/>
</textElement>
<textFieldExpression><![CDATA[$R{header.empresa}]]></textFieldExpression>
</textField>
<textField pattern="" isBlankWhenNull="true">
<reportElement x="65" y="0" width="213" height="20" uuid="863371bf-b179-4c59-8df4-90975b3dc14e"/>
<textElement textAlignment="Left">
<font size="8" isBold="true"/>
<paragraph lineSpacing="Single"/>
</textElement>
<textFieldExpression><![CDATA[$F{nombempresa}]]></textFieldExpression>
</textField>
</band>
</groupHeader>
</group>
<group name="grupoBanco">
<groupExpression><![CDATA[$F{nomeInstFinanceira}]]></groupExpression>
<groupHeader>
<band height="42">
<textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement stretchType="RelativeToTallestObject" x="69" y="30" width="149" height="20" isPrintWhenDetailOverflows="true" uuid="70fc9e98-5101-446d-87ed-6c6097ae509e"/>
<reportElement stretchType="RelativeToTallestObject" mode="Opaque" x="65" y="22" width="149" height="20" isPrintWhenDetailOverflows="true" backcolor="#CCCCCC" uuid="70fc9e98-5101-446d-87ed-6c6097ae509e"/>
<box>
<topPen lineWidth="0.5"/>
<leftPen lineWidth="0.5"/>
<bottomPen lineWidth="0.5"/>
<rightPen lineWidth="0.5"/>
</box>
<textElement textAlignment="Center" verticalAlignment="Middle">
<font size="8" isBold="true"/>
<paragraph lineSpacing="Single"/>
@ -44,7 +81,13 @@
<textFieldExpression><![CDATA[$R{header.agencia}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement stretchType="RelativeToTallestObject" x="221" y="30" width="67" height="20" isPrintWhenDetailOverflows="true" uuid="2f0a53c0-e005-4de6-816f-323ae5c9641d"/>
<reportElement stretchType="RelativeToTallestObject" mode="Opaque" x="214" y="22" width="67" height="20" isPrintWhenDetailOverflows="true" backcolor="#CCCCCC" uuid="2f0a53c0-e005-4de6-816f-323ae5c9641d"/>
<box>
<topPen lineWidth="0.5"/>
<leftPen lineWidth="0.5"/>
<bottomPen lineWidth="0.5"/>
<rightPen lineWidth="0.5"/>
</box>
<textElement textAlignment="Center" verticalAlignment="Middle">
<font size="8" isBold="true"/>
<paragraph lineSpacing="Single"/>
@ -52,40 +95,27 @@
<textFieldExpression><![CDATA[$R{header.dtmotivo}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement stretchType="RelativeToTallestObject" x="291" y="30" width="64" height="20" isPrintWhenDetailOverflows="true" uuid="52a2634b-17d1-4ce6-9f8b-6202bc443e95"/>
<reportElement stretchType="RelativeToTallestObject" mode="Opaque" x="281" y="22" width="64" height="20" isPrintWhenDetailOverflows="true" backcolor="#CCCCCC" uuid="52a2634b-17d1-4ce6-9f8b-6202bc443e95"/>
<box>
<topPen lineWidth="0.5"/>
<leftPen lineWidth="0.5"/>
<bottomPen lineWidth="0.5"/>
<rightPen lineWidth="0.5"/>
</box>
<textElement textAlignment="Center" verticalAlignment="Middle">
<font size="8" isBold="true"/>
<paragraph lineSpacing="Single"/>
</textElement>
<textFieldExpression><![CDATA[$R{header.vrdeposito}]]></textFieldExpression>
</textField>
<line>
<reportElement stretchType="RelativeToTallestObject" x="220" y="28" width="1" height="22" isPrintWhenDetailOverflows="true" uuid="0de74fe7-3428-4c4b-adbe-658a8315bded"/>
</line>
<line>
<reportElement stretchType="RelativeToTallestObject" x="289" y="28" width="1" height="22" isPrintWhenDetailOverflows="true" uuid="c837164a-9e73-4037-832a-79ae3c79569c"/>
</line>
<line>
<reportElement stretchType="RelativeToTallestObject" x="356" y="28" width="1" height="22" isPrintWhenDetailOverflows="true" uuid="336cfe8b-cc45-4970-9f92-fe4a64b00535"/>
</line>
<textField>
<reportElement x="2" y="0" width="86" height="20" uuid="97c1f585-395c-487e-bcbd-3a1260f47c9c"/>
<textElement textAlignment="Center">
<font size="8" isBold="true"/>
<paragraph lineSpacing="Single"/>
</textElement>
<textFieldExpression><![CDATA[$R{header.empresa}]]></textFieldExpression>
</textField>
<textField pattern="" isBlankWhenNull="true">
<reportElement x="88" y="0" width="213" height="20" uuid="863371bf-b179-4c59-8df4-90975b3dc14e"/>
<textElement textAlignment="Left">
<font size="8" isBold="true"/>
<paragraph lineSpacing="Single"/>
</textElement>
<textFieldExpression><![CDATA[$F{nombempresa}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement stretchType="RelativeToTallestObject" x="357" y="30" width="64" height="20" isPrintWhenDetailOverflows="true" uuid="abb21651-0e84-4231-a213-fe0a5a7fa493"/>
<reportElement stretchType="RelativeToTallestObject" mode="Opaque" x="345" y="22" width="64" height="20" isPrintWhenDetailOverflows="true" backcolor="#CCCCCC" uuid="abb21651-0e84-4231-a213-fe0a5a7fa493"/>
<box>
<topPen lineWidth="0.5"/>
<leftPen lineWidth="0.5"/>
<bottomPen lineWidth="0.5"/>
<rightPen lineWidth="0.5"/>
</box>
<textElement textAlignment="Center" verticalAlignment="Middle">
<font size="8" isBold="true"/>
<paragraph lineSpacing="Single"/>
@ -93,57 +123,101 @@
<textFieldExpression><![CDATA[$R{header.vrfechamento}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement stretchType="RelativeToTallestObject" x="424" y="30" width="64" height="20" isPrintWhenDetailOverflows="true" uuid="a704e07a-dff4-4f1f-9acb-e31066999543"/>
<reportElement stretchType="RelativeToTallestObject" mode="Opaque" x="409" y="22" width="64" height="20" isPrintWhenDetailOverflows="true" backcolor="#CCCCCC" uuid="a704e07a-dff4-4f1f-9acb-e31066999543"/>
<box>
<topPen lineWidth="0.5"/>
<leftPen lineWidth="0.5"/>
<bottomPen lineWidth="0.5"/>
<rightPen lineWidth="0.5"/>
</box>
<textElement textAlignment="Center" verticalAlignment="Middle">
<font size="8" isBold="true"/>
<paragraph lineSpacing="Single"/>
</textElement>
<textFieldExpression><![CDATA[$R{header.saldo}]]></textFieldExpression>
</textField>
<line>
<reportElement stretchType="RelativeToTallestObject" x="423" y="28" width="1" height="22" isPrintWhenDetailOverflows="true" uuid="8949f7a3-640a-473f-a524-afe5817d168d"/>
</line>
<textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement stretchType="RelativeToTallestObject" x="493" y="28" width="60" height="20" isPrintWhenDetailOverflows="true" uuid="419b40a0-83c0-440a-b4fb-c65ddd4b6fdb"/>
<reportElement stretchType="RelativeToTallestObject" mode="Opaque" x="473" y="22" width="60" height="20" isPrintWhenDetailOverflows="true" backcolor="#CCCCCC" uuid="419b40a0-83c0-440a-b4fb-c65ddd4b6fdb"/>
<box>
<topPen lineWidth="0.5"/>
<leftPen lineWidth="0.5"/>
<bottomPen lineWidth="0.5"/>
<rightPen lineWidth="0.5"/>
</box>
<textElement textAlignment="Center" verticalAlignment="Middle">
<font size="8" isBold="true"/>
<paragraph lineSpacing="Single"/>
</textElement>
<textFieldExpression><![CDATA[$R{header.numdeposito}]]></textFieldExpression>
</textField>
<line>
<reportElement stretchType="RelativeToTallestObject" x="490" y="28" width="1" height="22" isPrintWhenDetailOverflows="true" uuid="8a19715a-cc08-4b35-9402-760542654f5d"/>
</line>
<line>
<reportElement stretchType="RelativeToTallestObject" x="67" y="28" width="1" height="22" isPrintWhenDetailOverflows="true" uuid="58e8999f-8c51-4a8a-9820-cf39407532f3"/>
</line>
<textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement stretchType="RelativeToTallestObject" x="2" y="30" width="65" height="20" isPrintWhenDetailOverflows="true" uuid="1db939e0-b893-47c7-b579-4da533fa3c85"/>
<reportElement stretchType="RelativeToTallestObject" mode="Opaque" x="0" y="22" width="65" height="20" isPrintWhenDetailOverflows="true" backcolor="#CCCCCC" uuid="1db939e0-b893-47c7-b579-4da533fa3c85"/>
<box>
<topPen lineWidth="0.5"/>
<leftPen lineWidth="0.5"/>
<bottomPen lineWidth="0.5"/>
<rightPen lineWidth="0.5"/>
</box>
<textElement textAlignment="Center" verticalAlignment="Middle">
<font size="8" isBold="true"/>
<paragraph lineSpacing="Single"/>
</textElement>
<textFieldExpression><![CDATA[$R{header.numeroAgencia}]]></textFieldExpression>
</textField>
<textField>
<reportElement x="0" y="2" width="300" height="20" uuid="92047ae9-a84e-40cc-89d4-9a1df33b267e"/>
<textFieldExpression><![CDATA[$F{nomeInstFinanceira} != null ? $F{nomeInstFinanceira} : ""]]></textFieldExpression>
</textField>
</band>
</groupHeader>
<groupFooter>
<band height="50">
<textField pattern="¤ #,##0.00">
<reportElement x="281" y="0" width="64" height="20" uuid="e2ba52ea-22ed-4d11-b11f-6f7831d57c43"/>
<textElement textAlignment="Right">
<font size="8" isBold="true"/>
</textElement>
<textFieldExpression><![CDATA[$V{DEPOSITO_BANCO}]]></textFieldExpression>
</textField>
<textField pattern="¤ #,##0.00">
<reportElement x="345" y="0" width="64" height="20" uuid="695d6008-0322-46fd-9423-ec88ceaccdb9"/>
<textElement textAlignment="Right">
<font size="8" isBold="true"/>
</textElement>
<textFieldExpression><![CDATA[$V{VLFECHAMENTO_BANCO}]]></textFieldExpression>
</textField>
<textField pattern="¤ #,##0.00">
<reportElement x="409" y="0" width="64" height="20" uuid="a0492959-dfa8-4d34-b1ce-ff7a09b8b706"/>
<textElement textAlignment="Right">
<font size="8" isBold="true"/>
</textElement>
<textFieldExpression><![CDATA[$V{PENDENTE_BANCO}]]></textFieldExpression>
</textField>
<staticText>
<reportElement x="0" y="0" width="65" height="17" uuid="303904b8-89e3-4223-b081-c9d61d305a29"/>
<textElement>
<font size="8" isBold="true"/>
<paragraph lineSpacing="Single"/>
</textElement>
<text><![CDATA[Total]]></text>
</staticText>
</band>
</groupFooter>
</group>
<background>
<band splitType="Stretch"/>
</background>
<pageHeader>
<band height="41" splitType="Stretch">
<textField>
<reportElement x="231" y="20" width="49" height="20" uuid="d8c71cf9-aef2-4980-b3a6-c26e1571b27a"/>
<reportElement x="0" y="21" width="49" height="20" uuid="d8c71cf9-aef2-4980-b3a6-c26e1571b27a"/>
<textElement>
<font isBold="true"/>
<font size="8" isBold="true"/>
<paragraph lineSpacing="Single"/>
</textElement>
<textFieldExpression><![CDATA[$R{header.data}]]></textFieldExpression>
</textField>
<textField>
<reportElement x="397" y="0" width="56" height="20" uuid="d4cd880a-3ec0-44e6-bc35-95bc997e1d7b"/>
<textElement>
<textElement textAlignment="Right">
<font size="8" isBold="true"/>
<paragraph lineSpacing="Single"/>
</textElement>
<textFieldExpression><![CDATA[$R{header.data.hora}]]></textFieldExpression>
@ -151,20 +225,23 @@
<textField evaluationTime="Report">
<reportElement x="529" y="20" width="22" height="20" uuid="aac9665b-dfc2-4c3d-b5e2-8186b328f888"/>
<textElement textAlignment="Right">
<font size="8" isBold="true"/>
<paragraph lineSpacing="Single"/>
</textElement>
<textFieldExpression><![CDATA[" " + $V{PAGE_NUMBER}]]></textFieldExpression>
</textField>
<textField>
<reportElement x="463" y="20" width="42" height="20" uuid="649ab97a-99cf-4189-9d4d-d18b4b24f3ed"/>
<textElement>
<textElement textAlignment="Right">
<font size="8" isBold="true"/>
<paragraph lineSpacing="Single"/>
</textElement>
<textFieldExpression><![CDATA[$R{header.pagina}]]></textFieldExpression>
</textField>
<textField>
<reportElement x="280" y="20" width="182" height="20" uuid="7ec249cf-a04d-46e0-969e-6602f0aa0dcb"/>
<reportElement x="49" y="21" width="183" height="20" uuid="7ec249cf-a04d-46e0-969e-6602f0aa0dcb"/>
<textElement>
<font size="8" isBold="true"/>
<paragraph lineSpacing="Single"/>
</textElement>
<textFieldExpression><![CDATA[$P{fecInicio} + " à " + $P{fecFinal}]]></textFieldExpression>
@ -172,13 +249,15 @@
<textField>
<reportElement x="0" y="0" width="231" height="20" uuid="7fcb08d6-b3f7-48c2-bb2c-76d34ef4a072"/>
<textElement>
<font size="8" isBold="true"/>
<paragraph lineSpacing="Single"/>
</textElement>
<textFieldExpression><![CDATA[$P{TITULO}]]></textFieldExpression>
</textField>
<textField pattern="dd/MM/yyyy HH:mm">
<reportElement x="453" y="0" width="98" height="20" uuid="d70f1f3d-9075-406d-aa62-16f09a0cb84f"/>
<textElement textAlignment="Left">
<textElement textAlignment="Right">
<font size="8" isBold="true"/>
<paragraph lineSpacing="Single"/>
</textElement>
<textFieldExpression><![CDATA[new java.util.Date()]]></textFieldExpression>
@ -186,6 +265,7 @@
<textField>
<reportElement x="505" y="20" width="24" height="20" uuid="fd3d30ce-562a-4dcd-a842-9e9aca3ae3c6"/>
<textElement textAlignment="Right">
<font size="8" isBold="true"/>
<paragraph lineSpacing="Single"/>
</textElement>
<textFieldExpression><![CDATA[$V{PAGE_NUMBER}+" de"]]></textFieldExpression>
@ -193,12 +273,15 @@
</band>
</pageHeader>
<detail>
<band height="18" splitType="Stretch">
<rectangle>
<reportElement stretchType="RelativeToTallestObject" x="1" y="0" width="554" height="18" uuid="58d686e0-88cb-4708-b589-fa3746de7a5b"/>
</rectangle>
<band height="17" splitType="Stretch">
<textField isStretchWithOverflow="true" pattern="dd/MM/yyyy" isBlankWhenNull="true">
<reportElement stretchType="RelativeToTallestObject" x="222" y="1" width="67" height="17" uuid="648d6f06-b87e-4042-8ac0-552a3a9ca17c"/>
<reportElement stretchType="RelativeToTallestObject" x="214" y="0" width="67" height="17" uuid="648d6f06-b87e-4042-8ac0-552a3a9ca17c"/>
<box>
<topPen lineWidth="0.5"/>
<leftPen lineWidth="0.5"/>
<bottomPen lineWidth="0.5"/>
<rightPen lineWidth="0.5"/>
</box>
<textElement textAlignment="Center">
<font size="8" isBold="true"/>
<paragraph lineSpacing="Single"/>
@ -206,7 +289,13 @@
<textFieldExpression><![CDATA[$F{dtmotivo}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" pattern="" isBlankWhenNull="true">
<reportElement stretchType="RelativeToTallestObject" x="69" y="1" width="149" height="17" uuid="640aae14-6703-4137-ae50-c2612e98efb0"/>
<reportElement stretchType="RelativeToTallestObject" x="65" y="0" width="149" height="17" uuid="640aae14-6703-4137-ae50-c2612e98efb0"/>
<box>
<topPen lineWidth="0.5"/>
<leftPen lineWidth="0.5"/>
<bottomPen lineWidth="0.5"/>
<rightPen lineWidth="0.5"/>
</box>
<textElement textAlignment="Left">
<font size="8" isBold="true"/>
<paragraph lineSpacing="Single"/>
@ -214,7 +303,13 @@
<textFieldExpression><![CDATA[$F{nombpuntoventa}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" pattern="¤ #,##0.00" isBlankWhenNull="true">
<reportElement stretchType="RelativeToTallestObject" x="291" y="1" width="64" height="17" uuid="c50e9a15-f55c-4859-b98b-f5181f95d614"/>
<reportElement stretchType="RelativeToTallestObject" x="281" y="0" width="64" height="17" uuid="c50e9a15-f55c-4859-b98b-f5181f95d614"/>
<box>
<topPen lineWidth="0.5"/>
<leftPen lineWidth="0.5"/>
<bottomPen lineWidth="0.5"/>
<rightPen lineWidth="0.5"/>
</box>
<textElement textAlignment="Right">
<font size="8" isBold="true"/>
<paragraph lineSpacing="Single"/>
@ -222,7 +317,13 @@
<textFieldExpression><![CDATA[$F{vrdeposito}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" pattern="¤ #,##0.00" isBlankWhenNull="true">
<reportElement stretchType="RelativeToTallestObject" x="357" y="1" width="64" height="17" uuid="a5788fa8-4c63-4d06-b573-48c62d78c222"/>
<reportElement stretchType="RelativeToTallestObject" x="345" y="0" width="64" height="17" uuid="a5788fa8-4c63-4d06-b573-48c62d78c222"/>
<box>
<topPen lineWidth="0.5"/>
<leftPen lineWidth="0.5"/>
<bottomPen lineWidth="0.5"/>
<rightPen lineWidth="0.5"/>
</box>
<textElement textAlignment="Right">
<font size="8" isBold="true"/>
<paragraph lineSpacing="Single"/>
@ -230,7 +331,13 @@
<textFieldExpression><![CDATA[$F{vrfechamento}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" pattern="¤ #,##0.00" isBlankWhenNull="true">
<reportElement stretchType="RelativeToTallestObject" x="425" y="1" width="62" height="17" uuid="4a87d5aa-6020-4021-bb4c-5962a65acd14"/>
<reportElement stretchType="RelativeToTallestObject" x="409" y="0" width="64" height="17" uuid="4a87d5aa-6020-4021-bb4c-5962a65acd14"/>
<box>
<topPen lineWidth="0.5"/>
<leftPen lineWidth="0.5"/>
<bottomPen lineWidth="0.5"/>
<rightPen lineWidth="0.5"/>
</box>
<textElement textAlignment="Right">
<font size="8" isBold="true"/>
<paragraph lineSpacing="Single"/>
@ -238,33 +345,27 @@
<textFieldExpression><![CDATA[$F{saldo}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" pattern="¤ #,##0.00" isBlankWhenNull="true">
<reportElement stretchType="RelativeToTallestObject" isPrintRepeatedValues="false" x="493" y="1" width="60" height="17" uuid="8b59222e-761c-4aba-9132-638c2b9932a9"/>
<textElement textAlignment="Left" verticalAlignment="Top">
<reportElement stretchType="RelativeToTallestObject" x="473" y="0" width="60" height="17" uuid="8b59222e-761c-4aba-9132-638c2b9932a9"/>
<box>
<topPen lineWidth="0.5"/>
<leftPen lineWidth="0.5"/>
<bottomPen lineWidth="0.5"/>
<rightPen lineWidth="0.5"/>
</box>
<textElement textAlignment="Center" verticalAlignment="Top">
<font size="8" isBold="true"/>
<paragraph lineSpacing="Single"/>
</textElement>
<textFieldExpression><![CDATA[$F{numdeposito}]]></textFieldExpression>
</textField>
<line>
<reportElement stretchType="RelativeToTallestObject" x="220" y="0" width="1" height="18" uuid="7bc5e76e-0e94-44fa-aa89-c4096d8cd8ac"/>
</line>
<line>
<reportElement stretchType="RelativeToTallestObject" x="289" y="0" width="1" height="18" uuid="17cfcf71-9da9-45b9-9656-c6418fba738b"/>
</line>
<line>
<reportElement stretchType="RelativeToTallestObject" x="356" y="0" width="1" height="18" uuid="7826e8ca-b064-4efa-99b4-d72255618d83"/>
</line>
<line>
<reportElement stretchType="RelativeToTallestObject" x="423" y="0" width="1" height="18" uuid="9c64427b-0721-4832-8b90-e58de0a41eca"/>
</line>
<line>
<reportElement stretchType="RelativeToTallestObject" x="490" y="0" width="1" height="18" uuid="0bc785b2-e08f-46ed-9faf-120551168924"/>
</line>
<line>
<reportElement stretchType="RelativeToTallestObject" x="67" y="0" width="1" height="18" uuid="53b9ebeb-f71d-4414-a73d-2188b6083db9"/>
</line>
<textField pattern="" isBlankWhenNull="true">
<reportElement x="2" y="1" width="65" height="17" uuid="4f651cd3-e07f-42d3-ba24-d0c2bcaa3460"/>
<reportElement x="0" y="0" width="65" height="17" uuid="4f651cd3-e07f-42d3-ba24-d0c2bcaa3460"/>
<box>
<topPen lineWidth="0.5"/>
<leftPen lineWidth="0.5"/>
<bottomPen lineWidth="0.5"/>
<rightPen lineWidth="0.5"/>
</box>
<textElement textAlignment="Left">
<font size="8" isBold="true"/>
<paragraph lineSpacing="Single"/>
@ -276,42 +377,42 @@
<summary>
<band height="78">
<staticText>
<reportElement x="180" y="12" width="100" height="20" uuid="b4440540-2f18-4b9e-94d1-285e376ba362"/>
<textElement textAlignment="Right">
<reportElement x="0" y="12" width="100" height="20" uuid="b4440540-2f18-4b9e-94d1-285e376ba362"/>
<textElement>
<paragraph lineSpacing="Single"/>
</textElement>
<text><![CDATA[Total Depósitos]]></text>
</staticText>
<textField pattern="¤ #,##0.00">
<reportElement x="301" y="12" width="178" height="20" uuid="a8212576-8b4a-4b7d-9777-a727d1a86556"/>
<reportElement x="101" y="12" width="178" height="20" uuid="a8212576-8b4a-4b7d-9777-a727d1a86556"/>
<textElement>
<paragraph lineSpacing="Single"/>
</textElement>
<textFieldExpression><![CDATA[$V{TOTAL_DEPOSITOS}]]></textFieldExpression>
</textField>
<staticText>
<reportElement x="181" y="32" width="100" height="20" uuid="53594ff0-8b6d-4259-bea4-70f76933e536"/>
<textElement textAlignment="Right">
<reportElement x="0" y="32" width="100" height="20" uuid="53594ff0-8b6d-4259-bea4-70f76933e536"/>
<textElement>
<paragraph lineSpacing="Single"/>
</textElement>
<text><![CDATA[Total Fechamento]]></text>
</staticText>
<textField pattern="¤ #,##0.00">
<reportElement x="301" y="32" width="178" height="20" uuid="46b3f5bb-1a6e-47da-9285-5f5a5fc759f8"/>
<reportElement x="100" y="32" width="178" height="20" uuid="46b3f5bb-1a6e-47da-9285-5f5a5fc759f8"/>
<textElement>
<paragraph lineSpacing="Single"/>
</textElement>
<textFieldExpression><![CDATA[$V{TOTAL_FECHAMENTO}]]></textFieldExpression>
</textField>
<staticText>
<reportElement x="181" y="52" width="100" height="20" uuid="d746843f-a730-4bbb-9520-80954166d840"/>
<textElement textAlignment="Right">
<reportElement x="0" y="52" width="100" height="20" uuid="d746843f-a730-4bbb-9520-80954166d840"/>
<textElement>
<paragraph lineSpacing="Single"/>
</textElement>
<text><![CDATA[Total Pendente]]></text>
</staticText>
<textField pattern="¤ #,##0.00">
<reportElement x="301" y="52" width="178" height="20" uuid="5c04bbea-5e2e-4fcc-a965-4e91f5d8db76"/>
<reportElement x="100" y="52" width="178" height="20" uuid="5c04bbea-5e2e-4fcc-a965-4e91f5d8db76"/>
<textElement>
<paragraph lineSpacing="Single"/>
</textElement>

51
src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioDepositos.pdf 100644
View File

@ -0,0 +1,51 @@
%PDF-1.4
%âãÏÓ
3 0 obj
<</Length 681/Filter/FlateDecode>>stream
xœ½˜ÍnÔ0€ïyŠ9–Y<>í86GEꉟ܇ª›Ðþ@»ˆ×åx;«Œ
ë±¼¦ªÚ­«±¿™oºžU¾7/‡F°ÂÀ°n^Í»FÂÕôWῦŸVK¶Íê ·Íųá뻄¸Ù>^~üä_×á¸Ò@’Fgdk ô[ó(Bîïš À)3wÿÈ®n:J&—Ý<E28094>Í~ÁôR’aIßäPg2t¯ˆìWB®¤@½èä™ÀNº¶ÓŒC„õø_;š(Z ÇoŸ™í WP;xîÛs?6·ïèà§Ïüj®çý›ãñV·}Ü¿m¤Ò­Œ‹Mó!µ)M±Ûð;ÚéfO!!ò<> ),T¶Ÿù0}<7D>©Ô"H ̔ʛg!e±Ž|àÂ
‹Gó!`t<>#ÿG¦Ës”Ê›g!eñŽ ù<> ‹Gñ<47>BG†¼Ñ´t™Žyó,¤,Ö‘\XaQàh>¤Ì‘––8r*ÏQ*ož…”Å;rŠ°¦E‰£xQâÈÉÅQ×å:Jäͳ<C38D>²XG>pa…EÉ<45>-¢¢®@ºÅ<C2BA>ͼŒ"o¾¯Ežž™ƒ„ÃÊ9=9뀨=hâ£CÍïÌjB–_d ¤ÃaaUPôa$ô‹ô.§úŠ?‚ØâS¢+_8BáY±û3‹ï¾!ªÃ¢®€¢ù˜JŠgG+ Ž1:Óª
(~‰¤xV0³xaFÑ<46>UW@ÑdK%ų‚€#‹'<27>¢U”Ì®0ÉŒÌ)~æ„Úmæ»ÿô=›÷4D»Vk0ì‘sŸR zNß? G*ßÆßQ§9Ãþp½<70>Wã·ß_û‡3‘J"ëQ—­öÁ×u9Þ|¾ÞŽ»Ã¾FaI`•†©-t–/ìí¸[û²Šž_=*+<2B>Ë.ëíïNA
endstream
endobj
1 0 obj
<</Group<</Type/Group/CS/DeviceRGB/S/Transparency>>/Parent 4 0 R/Contents 3 0 R/Type/Page/Resources<</ProcSet [/PDF /Text /ImageB /ImageC /ImageI]/ColorSpace<</CS/DeviceRGB>>/Font<</F1 2 0 R>>>>/MediaBox[0 0 595 842]>>
endobj
5 0 obj
[1 0 R/XYZ 0 852 0]
endobj
2 0 obj
<</BaseFont/Helvetica/Type/Font/Encoding/WinAnsiEncoding/Subtype/Type1>>
endobj
4 0 obj
<</ITXT(2.1.7)/Type/Pages/Count 1/Kids[1 0 R]>>
endobj
6 0 obj
<</Names[(JR_PAGE_ANCHOR_0_1) 5 0 R]>>
endobj
7 0 obj
<</Dests 6 0 R>>
endobj
8 0 obj
<</Names 7 0 R/Type/Catalog/ViewerPreferences<</PrintScaling/AppDefault>>/Pages 4 0 R>>
endobj
9 0 obj
<</Creator(JasperReports Library version 5.6.0)/Producer(iText 2.1.7 by 1T3XT)/ModDate(D:20190227095217-03'00')/CreationDate(D:20190227095217-03'00')>>
endobj
xref
0 10
0000000000 65535 f
0000000763 00000 n
0000001032 00000 n
0000000015 00000 n
0000001120 00000 n
0000000997 00000 n
0000001183 00000 n
0000001237 00000 n
0000001269 00000 n
0000001372 00000 n
trailer
<</Root 8 0 R/ID [<fc797da608c66e28d3e08ba8d5f25ca1><636b874ee70d10c4927e6e7bb9b3d064>]/Info 9 0 R/Size 10>>
startxref
1539
%%EOF

18
src/java/com/rjconsultores/ventaboletos/relatorios/utilitarios/RelatorioDepositoBean.java
View File

@ -12,6 +12,24 @@ public class RelatorioDepositoBean {
private Date dtmotivo;
private String numdeposito;
private String numpuntoventa;
private String codigoInstFinanceira;
private String nomeInstFinanceira;
public String getCodigoInstFinanceira() {
return codigoInstFinanceira;
}
public void setCodigoInstFinanceira(String codigoInstFinanceira) {
this.codigoInstFinanceira = codigoInstFinanceira;
}
public String getNomeInstFinanceira() {
return nomeInstFinanceira;
}
public void setNomeInstFinanceira(String nomeInstFinanceira) {
this.nomeInstFinanceira = nomeInstFinanceira;
}
public String getNombpuntoventa() {
return nombpuntoventa;

48
src/java/com/rjconsultores/ventaboletos/web/gui/controladores/contacorrente/RelatorioDepositosController.java
View File

@ -2,7 +2,6 @@ package com.rjconsultores.ventaboletos.web.gui.controladores.contacorrente;
import java.text.SimpleDateFormat;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import javax.sql.DataSource;
@ -12,35 +11,16 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Scope;
import org.springframework.stereotype.Controller;
import org.zkoss.util.resource.Labels;
import org.zkoss.zhtml.Messagebox;
import org.zkoss.zk.ui.Component;
import org.zkoss.zk.ui.event.Event;
import org.zkoss.zk.ui.event.EventListener;
import org.zkoss.zul.Checkbox;
import org.zkoss.zul.Combobox;
import org.zkoss.zul.Paging;
import org.zkoss.zul.Textbox;
import org.zkoss.zul.api.Datebox;
import com.rjconsultores.ventaboletos.entidad.Cortesia;
import com.rjconsultores.ventaboletos.entidad.Empresa;
import com.rjconsultores.ventaboletos.entidad.MotivoViaje;
import com.rjconsultores.ventaboletos.entidad.PuntoVenta;
import com.rjconsultores.ventaboletos.entidad.TipoCortesia;
import com.rjconsultores.ventaboletos.relatorios.impl.RelatorioAgenciasNaoImportadas;
import com.rjconsultores.ventaboletos.relatorios.impl.RelatorioDepositos;
import com.rjconsultores.ventaboletos.relatorios.utilitarios.Relatorio;
import com.rjconsultores.ventaboletos.service.MotivoViajeService;
import com.rjconsultores.ventaboletos.service.PuntoVentaService;
import com.rjconsultores.ventaboletos.service.TipoCortesiaService;
import com.rjconsultores.ventaboletos.service.impl.CortesiaServiceImpl;
import com.rjconsultores.ventaboletos.web.gui.controladores.relatorios.RelatorioAgenciasNaoImportadasController;
import com.rjconsultores.ventaboletos.web.utilerias.MyGenericForwardComposer;
import com.rjconsultores.ventaboletos.web.utilerias.MyListbox;
import com.rjconsultores.ventaboletos.web.utilerias.paginacion.HibernateSearchObject;
import com.rjconsultores.ventaboletos.web.utilerias.paginacion.PagedListWrapper;
import com.rjconsultores.ventaboletos.web.utilerias.render.RenderCortesia;
import com.trg.search.Filter;
@Controller("relatorioDepositosController")
@Scope("prototype")
@ -49,8 +29,6 @@ public class RelatorioDepositosController extends MyGenericForwardComposer {
private static final long serialVersionUID = 1L;
private static Logger log = Logger.getLogger(RelatorioDepositosController.class);
@Autowired
private PuntoVentaService puntoVentaService;
@Autowired
private DataSource dataSourceRead;
@ -59,7 +37,8 @@ public class RelatorioDepositosController extends MyGenericForwardComposer {
private Combobox cmbPuntoventa;
private Combobox cmbEmpresa;
private Checkbox chkFiltrarPendentes;
private Checkbox chkClassificarBanco;
private void executarRelatorio() throws Exception {
Map<String, Object> parametros = new HashMap<String, Object>();
@ -77,6 +56,10 @@ public class RelatorioDepositosController extends MyGenericForwardComposer {
parametros.put("filtrarPendentes", true);
}
if (chkClassificarBanco.isChecked()) {
parametros.put("isClassificaPorBanco", true);
}
SimpleDateFormat sdf = new SimpleDateFormat("dd/MM/yyyy");
parametros.put("fecInicio", sdf.format(this.datInicial.getValue()));
parametros.put("fecFinal", sdf.format(this.datFinal.getValue()));
@ -89,11 +72,28 @@ public class RelatorioDepositosController extends MyGenericForwardComposer {
args.put("relatorio", relatorio);
openWindow("/component/reportView.zul",
Labels.getLabel("indexController.mniRelatorioDepositos.label"), args, MODAL);
Labels.getLabel("indexController.mniRelatorioDepositos.label"), args, MyGenericForwardComposer.MODAL);
}
public void onClick$chkFiltrarPendentes() {
if (chkFiltrarPendentes.isChecked()) {
chkClassificarBanco.setDisabled(false);
} else {
chkClassificarBanco.setChecked(false);
chkClassificarBanco.setDisabled(true);
}
}
public void onClick$btnExecutarRelatorio(Event ev) throws Exception {
executarRelatorio();
}
public Checkbox getChkClassificarBanco() {
return chkClassificarBanco;
}
public void setChkClassificarBanco(Checkbox chkClassificarBanco) {
this.chkClassificarBanco = chkClassificarBanco;
}
}