0014009: Chamado 65277 - Relatório fechamento por banco

fixes bug#14009
dev:Silverio
qua:Juliane

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@92483 d1611594-4594-4d17-8e1d-87c2c4800839
master
fabricio.oliveira 2019-04-29 13:13:02 +00:00
parent aa0c7cb616
commit 6b1f0f494d
3 changed files with 13 additions and 6 deletions

View File

@ -1,13 +1,14 @@
<?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="1.3636363636363644"/>
<property name="ireport.x" value="136"/>
<property name="ireport.zoom" value="1.4641000000000006"/>
<property name="ireport.x" value="0"/>
<property name="ireport.y" value="0"/>
<parameter name="fecInicio" class="java.lang.String">
<defaultValueExpression><![CDATA[]]></defaultValueExpression>
</parameter>
<parameter name="fecFinal" class="java.lang.String"/>
<parameter name="TITULO" class="java.lang.String"/>
<parameter name="isClassificaPorBanco" class="java.lang.Boolean"/>
<queryString>
<![CDATA[]]>
</queryString>
@ -24,8 +25,8 @@
<variable name="TOTAL_DEPOSITOS" class="java.math.BigDecimal" calculation="Sum">
<variableExpression><![CDATA[$F{vrdeposito}]]></variableExpression>
</variable>
<variable name="TOTAL_FECHAMENTO" class="java.math.BigDecimal" resetType="None">
<variableExpression><![CDATA[$V{VLFECHAMENTO_BANCO}]]></variableExpression>
<variable name="TOTAL_FECHAMENTO" class="java.math.BigDecimal" incrementType="Group" incrementGroup="grupo_data_agencia" calculation="Sum">
<variableExpression><![CDATA[$F{vrfechamento}]]></variableExpression>
</variable>
<variable name="TOTAL_SALDO" class="java.math.BigDecimal" calculation="Sum">
<variableExpression><![CDATA[$F{saldo}]]></variableExpression>
@ -40,7 +41,10 @@
<variableExpression><![CDATA[$F{saldo}]]></variableExpression>
</variable>
<variable name="TOTAL_PENDENTE" class="java.math.BigDecimal">
<variableExpression><![CDATA[$V{VLFECHAMENTO_BANCO}.subtract($V{DEPOSITO_BANCO})]]></variableExpression>
<variableExpression><![CDATA[$V{TOTAL_FECHAMENTO}.subtract($V{TOTAL_DEPOSITOS})]]></variableExpression>
</variable>
<variable name="verificaGrupoBanco" class="java.lang.String">
<variableExpression><![CDATA[$P{isClassificaPorBanco}==true?$F{nombpuntoventa}:""]]></variableExpression>
</variable>
<group name="empresa">
<groupExpression><![CDATA[$F{nombempresa}]]></groupExpression>
@ -169,7 +173,7 @@
</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>
<textFieldExpression><![CDATA[$F{nomeInstFinanceira} != null ? $F{nomeInstFinanceira} : "Não Consta Nenhum Depósito"]]></textFieldExpression>
</textField>
</band>
</groupHeader>

View File

@ -60,7 +60,10 @@ public class RelatorioDepositosController extends MyGenericForwardComposer {
if (chkClassificarBanco.isChecked()) {
parametros.put("isClassificaPorBanco", true);
}else {
parametros.put("isClassificaPorBanco", false);
}
int dias = DateUtil.diferencaEntreDatasEmdias(this.datInicial.getValue(), this.datFinal.getValue());
// Período maior que 360 dias (1 ano), para não deixar um range de daods muito grande e não "travar" o relatório.
if (dias > 360) {