fixes bug#18060

dev:
qua:

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@100109 d1611594-4594-4d17-8e1d-87c2c4800839
master
thiago.clemente 2020-02-10 00:37:16 +00:00
parent a7f325d032
commit 27203c9437
5 changed files with 147 additions and 155 deletions

View File

@ -6,8 +6,12 @@ import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Set;
import org.apache.log4j.Logger;
@ -68,6 +72,7 @@ public class RelatorioDepositosNovo extends Relatorio {
deposito.setVrfechamento(rs.getBigDecimal("vrdeposito"));
deposito.setCodigoInstFinanceira(rs.getString("codinstfin"));
deposito.setNomeInstFinanceira(rs.getString("nomeinstfin"));
deposito.setFechamentocntcorrenteId(rs.getLong("fechamentocntcorrente_id"));
if (! filtrarPendentes){
deposito.setNumdeposito(rs.getString("numdeposito"));
@ -75,7 +80,9 @@ public class RelatorioDepositosNovo extends Relatorio {
lsDadosRelatorio.add(deposito);
}
addApenasPendentes(parametros, lsDadosRelatorio);
if (lsDadosRelatorio.size() > 0) {
setLsDadosRelatorio(lsDadosRelatorio);
}
@ -113,7 +120,8 @@ public class RelatorioDepositosNovo extends Relatorio {
}
sql.append(" tmp.codinstfin, ");
sql.append(" tmp.nomeinstfin ");
sql.append(" tmp.nomeinstfin, ");
sql.append(" tmp.fechamentocntcorrente_id ");
sql.append(" FROM ");
sql.append(" ( SELECT DISTINCT e.nombempresa, ");
sql.append(" p.nombpuntoventa, ");
@ -185,4 +193,64 @@ public class RelatorioDepositosNovo extends Relatorio {
return sql.toString();
}
private void addApenasPendentes(Map<String, Object> parametros, List<RelatorioDepositoBean> lsDadosRelatorio) {
Map<Long, BigDecimal> mapaValorDeposito = new HashMap<Long, BigDecimal>();
Map<String, BigDecimal> mapaValorDepositoEmpresa = new HashMap<String, BigDecimal>();
Map<Long, BigDecimal> mapaValorFechamento = new HashMap<Long, BigDecimal>();
Map<String, BigDecimal> mapaValorFechamentoEmpresa = new HashMap<String, BigDecimal>();
Iterator<RelatorioDepositoBean> iterator = lsDadosRelatorio.iterator();
for (RelatorioDepositoBean bean: lsDadosRelatorio) {
if (!mapaValorDeposito.containsKey(bean.getFechamentocntcorrenteId())) {
mapaValorDeposito.put(bean.getFechamentocntcorrenteId(), bean.getVrdeposito());
} else {
mapaValorDeposito.put(bean.getFechamentocntcorrenteId(), mapaValorDeposito.get(bean.getFechamentocntcorrenteId()).add(bean.getVrdeposito()));
}
if (!mapaValorDepositoEmpresa.containsKey(bean.getNombempresa())) {
mapaValorDepositoEmpresa.put(bean.getNombempresa(), bean.getVrdeposito());
} else {
mapaValorDepositoEmpresa.put(bean.getNombempresa(), mapaValorDepositoEmpresa.get(bean.getNombempresa()).add(bean.getVrdeposito()));
}
if (!mapaValorFechamento.containsKey(bean.getFechamentocntcorrenteId())) {
mapaValorFechamento.put(bean.getFechamentocntcorrenteId(), bean.getVrfechamento());
}
if (!mapaValorFechamentoEmpresa.containsKey(bean.getNombempresa())) {
mapaValorFechamentoEmpresa.put(bean.getNombempresa(), bean.getVrfechamento());
} else {
mapaValorFechamentoEmpresa.put(bean.getNombempresa(), mapaValorFechamentoEmpresa.get(bean.getNombempresa()).add(bean.getVrfechamento()));
}
}
while (iterator.hasNext()) {
RelatorioDepositoBean bean = iterator.next();
BigDecimal deposito = mapaValorDeposito.get(bean.getFechamentocntcorrenteId());
BigDecimal fechamento = mapaValorFechamento.get(bean.getFechamentocntcorrenteId());
if (deposito.compareTo(fechamento) >= 0) {
mapaValorDepositoEmpresa.put(bean.getNombempresa(), mapaValorDepositoEmpresa.get(bean.getNombempresa()).subtract(bean.getVrdeposito()));
mapaValorFechamentoEmpresa.put(bean.getNombempresa(), mapaValorFechamentoEmpresa.get(bean.getNombempresa()).subtract(bean.getVrfechamento()));
iterator.remove();
}
}
BigDecimal totalDepositoGeral = BigDecimal.ZERO;
BigDecimal totalFechamentoGeral = BigDecimal.ZERO;
for (String nombempresa: mapaValorDepositoEmpresa.keySet()) {
totalDepositoGeral = totalDepositoGeral.add(mapaValorDepositoEmpresa.get(nombempresa));
}
for (String nombempresa: mapaValorFechamentoEmpresa.keySet()) {
totalFechamentoGeral = totalFechamentoGeral.add(mapaValorFechamentoEmpresa.get(nombempresa));
}
parametros.put("MAPA_VALOR_DEPOSITO_EMPRESA", mapaValorDepositoEmpresa);
parametros.put("MAPA_VALOR_FECHAMENTO_EMPRESA", mapaValorFechamentoEmpresa);
parametros.put("TOTAL_FECHAMENTO_GERAL", totalFechamentoGeral);
parametros.put("TOTAL_PENDENTE_GERAL", totalFechamentoGeral.subtract(totalDepositoGeral));
}
}

View File

@ -5,15 +5,19 @@
<property name="net.sf.jasperreports.export.xls.exclude.origin.keep.first.band.2" value="columnHeader"/>
<property name="net.sf.jasperreports.export.xls.remove.empty.space.between.rows" value="true"/>
<property name="net.sf.jasperreports.export.xls.remove.empty.space.between.columns" value="true"/>
<property name="ireport.zoom" value="1.6105100000000008"/>
<property name="ireport.zoom" value="2.0"/>
<property name="ireport.x" value="0"/>
<property name="ireport.y" value="0"/>
<property name="ireport.y" value="149"/>
<parameter name="TITULO" class="java.lang.String"/>
<parameter name="FILTROS" class="java.lang.String"/>
<parameter name="fecInicio" class="java.lang.String">
<defaultValueExpression><![CDATA[]]></defaultValueExpression>
</parameter>
<parameter name="fecFinal" class="java.lang.String"/>
<parameter name="MAPA_VALOR_DEPOSITO_EMPRESA" class="java.util.Map"/>
<parameter name="MAPA_VALOR_FECHAMENTO_EMPRESA" class="java.util.Map"/>
<parameter name="TOTAL_FECHAMENTO_GERAL" class="java.math.BigDecimal"/>
<parameter name="TOTAL_PENDENTE_GERAL" class="java.math.BigDecimal"/>
<field name="saldo" class="java.math.BigDecimal"/>
<field name="dtmotivo" class="java.util.Date"/>
<field name="nombpuntoventa" class="java.lang.String"/>
@ -24,6 +28,7 @@
<field name="numpuntoventa" class="java.lang.String"/>
<field name="nomeInstFinanceira" class="java.lang.String"/>
<field name="codigoInstFinanceira" class="java.lang.String"/>
<field name="fechamentocntcorrenteId" class="java.lang.Long"/>
<variable name="deposito_banco_total" class="java.math.BigDecimal" resetType="Group" resetGroup="bancos" calculation="Sum">
<variableExpression><![CDATA[$F{vrdeposito}]]></variableExpression>
<initialValueExpression><![CDATA[BigDecimal.ZERO]]></initialValueExpression>
@ -65,7 +70,7 @@
<groupHeader>
<band height="19">
<textField pattern="" isBlankWhenNull="true">
<reportElement mode="Opaque" x="52" y="0" width="523" height="19" backcolor="#E6E6E6" uuid="df37a90d-1ead-409b-9d1d-44a7bc8caf6d"/>
<reportElement uuid="df37a90d-1ead-409b-9d1d-44a7bc8caf6d" mode="Opaque" x="52" y="0" width="523" height="19" backcolor="#E6E6E6"/>
<box>
<bottomPen lineWidth="0.0" lineColor="#666666"/>
</box>
@ -76,7 +81,7 @@
<textFieldExpression><![CDATA[$F{nombempresa}]]></textFieldExpression>
</textField>
<textField>
<reportElement mode="Opaque" x="0" y="0" width="52" height="19" backcolor="#E6E6E6" uuid="9ac82d17-0a98-42a4-8575-d7146aab8154"/>
<reportElement uuid="9ac82d17-0a98-42a4-8575-d7146aab8154" mode="Opaque" x="0" y="0" width="52" height="19" backcolor="#E6E6E6"/>
<box>
<bottomPen lineWidth="0.0" lineColor="#666666"/>
</box>
@ -89,31 +94,9 @@
</band>
</groupHeader>
<groupFooter>
<band height="18">
<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
<reportElement stretchType="RelativeToTallestObject" mode="Opaque" x="330" y="0" width="86" height="13" backcolor="#E6E6E6" uuid="391ab78a-0835-4af0-a260-d5234e972f15"/>
<box>
<bottomPen lineWidth="0.25" lineColor="#666666"/>
</box>
<textElement textAlignment="Right">
<font size="8" isBold="false"/>
<paragraph lineSpacing="Single"/>
</textElement>
<textFieldExpression><![CDATA[$V{fechamento_empresa_total}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
<reportElement stretchType="RelativeToTallestObject" mode="Opaque" x="416" y="0" width="68" height="13" backcolor="#E6E6E6" uuid="aea9788f-cdb2-4370-bef8-5084bdae1b2b"/>
<box>
<bottomPen lineWidth="0.25" lineColor="#666666"/>
</box>
<textElement textAlignment="Right">
<font size="8" isBold="false"/>
<paragraph lineSpacing="Single"/>
</textElement>
<textFieldExpression><![CDATA[$V{saldo_empresa_total}]]></textFieldExpression>
</textField>
<band height="32">
<textField>
<reportElement mode="Opaque" x="0" y="0" width="262" height="13" backcolor="#E6E6E6" uuid="e00bc0b3-2832-46a8-9b9f-ba1e76731425"/>
<reportElement uuid="e00bc0b3-2832-46a8-9b9f-ba1e76731425" mode="Opaque" x="0" y="0" width="262" height="13" backcolor="#E6E6E6"/>
<box>
<bottomPen lineWidth="0.25" lineColor="#666666"/>
</box>
@ -124,7 +107,7 @@
<textFieldExpression><![CDATA[$R{footer.totalEmpresa}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
<reportElement stretchType="RelativeToTallestObject" mode="Opaque" x="262" y="0" width="68" height="13" backcolor="#E6E6E6" uuid="de0e9f31-976f-489f-8c1e-0d61889fed41"/>
<reportElement uuid="de0e9f31-976f-489f-8c1e-0d61889fed41" stretchType="RelativeToTallestObject" mode="Opaque" x="262" y="0" width="68" height="13" backcolor="#E6E6E6"/>
<box>
<bottomPen lineWidth="0.25" lineColor="#666666"/>
</box>
@ -135,7 +118,7 @@
<textFieldExpression><![CDATA[$V{deposito_empresa_total}]]></textFieldExpression>
</textField>
<staticText>
<reportElement stretchType="RelativeToTallestObject" mode="Opaque" x="484" y="0" width="91" height="13" backcolor="#E6E6E6" uuid="0c821f8e-8f92-453e-87ac-93094dbd2894"/>
<reportElement uuid="0c821f8e-8f92-453e-87ac-93094dbd2894" stretchType="RelativeToTallestObject" mode="Opaque" x="330" y="0" width="245" height="13" backcolor="#E6E6E6"/>
<box>
<bottomPen lineWidth="0.25" lineColor="#666666"/>
</box>
@ -145,6 +128,17 @@
</textElement>
<text><![CDATA[]]></text>
</staticText>
<textField>
<reportElement uuid="2beeb73e-d16e-4450-9e37-86c8a6e3428e" mode="Opaque" x="0" y="17" width="575" height="13" backcolor="#E6E6E6"/>
<box>
<bottomPen lineWidth="0.25" lineColor="#666666"/>
</box>
<textElement verticalAlignment="Middle">
<font size="8" isBold="true"/>
<paragraph lineSpacing="Single"/>
</textElement>
<textFieldExpression><![CDATA["Total Fechamento por Empresa: " + new DecimalFormat("#,##0.00").format($P{MAPA_VALOR_FECHAMENTO_EMPRESA}.get($F{nombempresa})) + " / Total Pendente por Empresa: " + new DecimalFormat("#,##0.00").format(((BigDecimal) $P{MAPA_VALOR_FECHAMENTO_EMPRESA}.get($F{nombempresa})).subtract((BigDecimal) $P{MAPA_VALOR_DEPOSITO_EMPRESA}.get($F{nombempresa})))]]></textFieldExpression>
</textField>
</band>
</groupFooter>
</group>
@ -153,7 +147,7 @@
<groupHeader>
<band height="14">
<textField isStretchWithOverflow="true" evaluationTime="Group" evaluationGroup="bancos" isBlankWhenNull="true">
<reportElement mode="Opaque" x="0" y="0" width="575" height="13" printWhenGroupChanges="bancos" forecolor="#006699" backcolor="#E6E6E6" uuid="f7278e85-60a3-4b44-bc72-c7daa9045f28"/>
<reportElement uuid="f7278e85-60a3-4b44-bc72-c7daa9045f28" mode="Opaque" x="0" y="0" width="575" height="13" printWhenGroupChanges="bancos" forecolor="#006699" backcolor="#E6E6E6"/>
<box>
<pen lineColor="#666666"/>
<topPen lineColor="#666666"/>
@ -169,7 +163,7 @@
</band>
<band height="14">
<textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement stretchType="RelativeToTallestObject" mode="Opaque" x="194" y="0" width="68" height="14" isPrintWhenDetailOverflows="true" forecolor="#666666" backcolor="#E6E6E6" uuid="4b72b45d-0d42-4126-a3f9-baf21b2ac7b6"/>
<reportElement uuid="4b72b45d-0d42-4126-a3f9-baf21b2ac7b6" stretchType="RelativeToTallestObject" mode="Opaque" x="194" y="0" width="68" height="14" isPrintWhenDetailOverflows="true" forecolor="#666666" backcolor="#E6E6E6"/>
<box>
<topPen lineWidth="0.0"/>
<leftPen lineWidth="0.0"/>
@ -183,21 +177,7 @@
<textFieldExpression><![CDATA[$R{header.fechamento}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement stretchType="RelativeToTallestObject" mode="Opaque" x="416" y="0" width="68" height="14" isPrintWhenDetailOverflows="true" forecolor="#666666" backcolor="#E6E6E6" uuid="5dd936e2-dee0-4372-aff7-9d78c0bd9c0d"/>
<box>
<topPen lineWidth="0.0"/>
<leftPen lineWidth="0.0"/>
<bottomPen lineWidth="0.0"/>
<rightPen lineWidth="0.0"/>
</box>
<textElement textAlignment="Right" verticalAlignment="Top">
<font size="10" isBold="false"/>
<paragraph lineSpacing="Single"/>
</textElement>
<textFieldExpression><![CDATA[$R{header.saldo}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement stretchType="RelativeToTallestObject" mode="Opaque" x="262" y="0" width="68" height="14" isPrintWhenDetailOverflows="true" forecolor="#666666" backcolor="#E6E6E6" uuid="920feb5b-1b51-4929-b07e-1b2d73faeb40"/>
<reportElement uuid="920feb5b-1b51-4929-b07e-1b2d73faeb40" stretchType="RelativeToTallestObject" mode="Opaque" x="262" y="0" width="68" height="14" isPrintWhenDetailOverflows="true" forecolor="#666666" backcolor="#E6E6E6"/>
<box>
<topPen lineWidth="0.0"/>
<leftPen lineWidth="0.0"/>
@ -211,21 +191,7 @@
<textFieldExpression><![CDATA[$R{header.vrdeposito}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement stretchType="RelativeToTallestObject" mode="Opaque" x="330" y="0" width="86" height="14" isPrintWhenDetailOverflows="true" forecolor="#666666" backcolor="#E6E6E6" uuid="6907904a-eda4-4cdf-9a4e-edfce4dff30e"/>
<box>
<topPen lineWidth="0.0"/>
<leftPen lineWidth="0.0"/>
<bottomPen lineWidth="0.0"/>
<rightPen lineWidth="0.0"/>
</box>
<textElement textAlignment="Right" verticalAlignment="Top">
<font size="10" isBold="false"/>
<paragraph lineSpacing="Single"/>
</textElement>
<textFieldExpression><![CDATA[$R{header.vrfechamento}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement stretchType="RelativeToTallestObject" mode="Opaque" x="484" y="0" width="91" height="14" isPrintWhenDetailOverflows="true" forecolor="#666666" backcolor="#E6E6E6" uuid="dc92845b-6f0c-4753-ae57-77e2715bca05"/>
<reportElement uuid="dc92845b-6f0c-4753-ae57-77e2715bca05" stretchType="RelativeToTallestObject" mode="Opaque" x="330" y="0" width="245" height="14" isPrintWhenDetailOverflows="true" forecolor="#666666" backcolor="#E6E6E6"/>
<box>
<topPen lineWidth="0.0"/>
<leftPen lineWidth="0.0"/>
@ -239,7 +205,7 @@
<textFieldExpression><![CDATA[$R{header.numdeposito}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement stretchType="RelativeToTallestObject" mode="Opaque" x="52" y="0" width="142" height="14" isPrintWhenDetailOverflows="true" forecolor="#666666" backcolor="#E6E6E6" uuid="1c354896-30ee-48bd-9d21-d80ff2831744"/>
<reportElement uuid="1c354896-30ee-48bd-9d21-d80ff2831744" stretchType="RelativeToTallestObject" mode="Opaque" x="52" y="0" width="142" height="14" isPrintWhenDetailOverflows="true" forecolor="#666666" backcolor="#E6E6E6"/>
<box>
<topPen lineWidth="0.0"/>
<leftPen lineWidth="0.0"/>
@ -253,7 +219,7 @@
<textFieldExpression><![CDATA[$R{header.agencia}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement stretchType="RelativeToTallestObject" mode="Opaque" x="0" y="0" width="52" height="14" isPrintWhenDetailOverflows="true" forecolor="#666666" backcolor="#E6E6E6" uuid="08b0b08a-a435-498e-831e-d820e7b0b563"/>
<reportElement uuid="08b0b08a-a435-498e-831e-d820e7b0b563" stretchType="RelativeToTallestObject" mode="Opaque" x="0" y="0" width="52" height="14" isPrintWhenDetailOverflows="true" forecolor="#666666" backcolor="#E6E6E6"/>
<box>
<topPen lineWidth="0.0"/>
<leftPen lineWidth="0.0"/>
@ -271,7 +237,7 @@
<groupFooter>
<band height="18">
<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
<reportElement stretchType="RelativeToTallestObject" mode="Opaque" x="262" y="0" width="68" height="13" backcolor="#E6E6E6" uuid="320a7bf0-3aec-4ee9-8ada-6423d3fe36fd"/>
<reportElement uuid="320a7bf0-3aec-4ee9-8ada-6423d3fe36fd" stretchType="RelativeToTallestObject" mode="Opaque" x="262" y="0" width="68" height="13" backcolor="#E6E6E6"/>
<box>
<bottomPen lineWidth="0.25" lineColor="#666666"/>
</box>
@ -281,30 +247,8 @@
</textElement>
<textFieldExpression><![CDATA[$V{deposito_banco_total}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
<reportElement stretchType="RelativeToTallestObject" mode="Opaque" x="416" y="0" width="68" height="13" backcolor="#E6E6E6" uuid="54787904-1e43-4bf9-b55c-647fc5b3ad87"/>
<box>
<bottomPen lineWidth="0.25" lineColor="#666666"/>
</box>
<textElement textAlignment="Right">
<font size="8" isBold="false"/>
<paragraph lineSpacing="Single"/>
</textElement>
<textFieldExpression><![CDATA[$V{saldo_banco_total}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
<reportElement stretchType="RelativeToTallestObject" mode="Opaque" x="330" y="0" width="86" height="13" backcolor="#E6E6E6" uuid="410ee9ab-631d-463a-9da3-da36ab7df206"/>
<box>
<bottomPen lineWidth="0.25" lineColor="#666666"/>
</box>
<textElement textAlignment="Right">
<font size="8" isBold="false"/>
<paragraph lineSpacing="Single"/>
</textElement>
<textFieldExpression><![CDATA[$V{fechamento_banco_total}]]></textFieldExpression>
</textField>
<textField>
<reportElement mode="Opaque" x="0" y="0" width="262" height="13" forecolor="#006699" backcolor="#E6E6E6" uuid="94e58dcc-914c-4096-b743-6a40116a05ec"/>
<reportElement uuid="94e58dcc-914c-4096-b743-6a40116a05ec" mode="Opaque" x="0" y="0" width="262" height="13" forecolor="#006699" backcolor="#E6E6E6"/>
<box>
<bottomPen lineWidth="0.25" lineColor="#666666"/>
</box>
@ -315,7 +259,7 @@
<textFieldExpression><![CDATA[$R{footer.totalBanco}]]></textFieldExpression>
</textField>
<staticText>
<reportElement stretchType="RelativeToTallestObject" mode="Opaque" x="484" y="0" width="91" height="13" backcolor="#E6E6E6" uuid="626ba993-1c2c-4f10-a3ce-bb6ed57e5b74"/>
<reportElement uuid="626ba993-1c2c-4f10-a3ce-bb6ed57e5b74" stretchType="RelativeToTallestObject" mode="Opaque" x="330" y="0" width="245" height="13" backcolor="#E6E6E6"/>
<box>
<bottomPen lineWidth="0.25" lineColor="#666666"/>
</box>
@ -334,9 +278,9 @@
<title>
<band height="56">
<frame>
<reportElement mode="Opaque" x="-10" y="-12" width="595" height="40" backcolor="#006699" uuid="0054fd73-707a-4615-8bae-2c2a29f606b3"/>
<reportElement uuid="0054fd73-707a-4615-8bae-2c2a29f606b3" mode="Opaque" x="-10" y="-12" width="595" height="40" backcolor="#006699"/>
<textField>
<reportElement x="10" y="10" width="575" height="24" forecolor="#FFFFFF" uuid="558af18f-0344-4d19-b3c8-3ae165b7c91d"/>
<reportElement uuid="558af18f-0344-4d19-b3c8-3ae165b7c91d" x="10" y="10" width="575" height="24" forecolor="#FFFFFF"/>
<textElement textAlignment="Justified" verticalAlignment="Middle" markup="styled">
<font fontName="SansSerif" size="18" isBold="true" isPdfEmbedded="true"/>
</textElement>
@ -344,11 +288,12 @@
</textField>
</frame>
<textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement stretchType="RelativeToTallestObject" x="52" y="42" width="523" height="14" forecolor="#333333" uuid="5dd823a7-3377-42a1-8e6f-977270e9bd79"/>
<reportElement uuid="5dd823a7-3377-42a1-8e6f-977270e9bd79" stretchType="RelativeToTallestObject" x="52" y="42" width="523" height="14" forecolor="#333333"/>
<textElement/>
<textFieldExpression><![CDATA[$P{FILTROS}]]></textFieldExpression>
</textField>
<textField>
<reportElement x="52" y="28" width="523" height="14" forecolor="#000000" uuid="0840bea7-0cea-4e77-bb5d-969baeaf8a92"/>
<reportElement uuid="0840bea7-0cea-4e77-bb5d-969baeaf8a92" x="52" y="28" width="523" height="14" forecolor="#000000"/>
<textElement>
<font size="10" isBold="true"/>
<paragraph lineSpacing="Single"/>
@ -356,7 +301,7 @@
<textFieldExpression><![CDATA[$P{fecInicio} + " à " + $P{fecFinal}]]></textFieldExpression>
</textField>
<textField>
<reportElement x="0" y="28" width="52" height="14" forecolor="#000000" uuid="8fe00f0a-6663-4f7e-9324-666a3dc60f77"/>
<reportElement uuid="8fe00f0a-6663-4f7e-9324-666a3dc60f77" x="0" y="28" width="52" height="14" forecolor="#000000"/>
<textElement>
<font size="10" isBold="true"/>
<paragraph lineSpacing="Single"/>
@ -364,7 +309,7 @@
<textFieldExpression><![CDATA[$R{header.data}]]></textFieldExpression>
</textField>
<textField>
<reportElement x="0" y="42" width="52" height="14" forecolor="#000000" uuid="a448c17f-6960-4fb3-8a96-c964c5baabf1"/>
<reportElement uuid="a448c17f-6960-4fb3-8a96-c964c5baabf1" x="0" y="42" width="52" height="14" forecolor="#000000"/>
<textElement>
<font size="10" isBold="false"/>
<paragraph lineSpacing="Single"/>
@ -382,7 +327,7 @@
<detail>
<band height="14">
<textField isStretchWithOverflow="true" pattern="dd/MM/yyyy" isBlankWhenNull="true">
<reportElement stretchType="RelativeToTallestObject" x="194" y="0" width="68" height="14" uuid="82d13b4c-c5af-4dc6-8353-58e0bd810b74"/>
<reportElement uuid="82d13b4c-c5af-4dc6-8353-58e0bd810b74" stretchType="RelativeToTallestObject" x="194" y="0" width="68" height="14"/>
<box>
<bottomPen lineWidth="0.25" lineColor="#666666"/>
</box>
@ -393,7 +338,7 @@
<textFieldExpression><![CDATA[$F{dtmotivo}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
<reportElement stretchType="RelativeToTallestObject" x="262" y="0" width="68" height="14" uuid="d2a192d3-8b19-4023-84b5-6ab5c749bff9"/>
<reportElement uuid="d2a192d3-8b19-4023-84b5-6ab5c749bff9" stretchType="RelativeToTallestObject" x="262" y="0" width="68" height="14"/>
<box>
<bottomPen lineWidth="0.25" lineColor="#666666"/>
</box>
@ -403,30 +348,8 @@
</textElement>
<textFieldExpression><![CDATA[$F{vrdeposito}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
<reportElement stretchType="RelativeToTallestObject" x="330" y="0" width="86" height="14" uuid="a9d99df3-e743-46cf-8454-deb020120916"/>
<box>
<bottomPen lineWidth="0.25" lineColor="#666666"/>
</box>
<textElement textAlignment="Right">
<font size="8" isBold="false"/>
<paragraph lineSpacing="Single"/>
</textElement>
<textFieldExpression><![CDATA[$F{vrfechamento}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
<reportElement stretchType="RelativeToTallestObject" x="416" y="0" width="68" height="14" uuid="fef8a9f7-d047-4c20-834e-dabd2d2fe0a8"/>
<box>
<bottomPen lineWidth="0.25" lineColor="#666666"/>
</box>
<textElement textAlignment="Right">
<font size="8" isBold="false"/>
<paragraph lineSpacing="Single"/>
</textElement>
<textFieldExpression><![CDATA[$F{saldo}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" pattern="" isBlankWhenNull="true">
<reportElement stretchType="RelativeToTallestObject" x="484" y="0" width="91" height="14" uuid="8a041e80-b312-4fcc-909b-e38cfd9078ba"/>
<reportElement uuid="8a041e80-b312-4fcc-909b-e38cfd9078ba" stretchType="RelativeToTallestObject" x="330" y="0" width="245" height="14"/>
<box>
<bottomPen lineWidth="0.25" lineColor="#666666"/>
</box>
@ -437,7 +360,7 @@
<textFieldExpression><![CDATA[$F{numdeposito}]]></textFieldExpression>
</textField>
<textField pattern="dd/MM/yyyy" isBlankWhenNull="true">
<reportElement stretchType="RelativeToTallestObject" x="52" y="0" width="142" height="14" uuid="655d7066-585e-45b8-8183-f91f0bc3b129"/>
<reportElement uuid="655d7066-585e-45b8-8183-f91f0bc3b129" stretchType="RelativeToTallestObject" x="52" y="0" width="142" height="14"/>
<box>
<bottomPen lineWidth="0.25" lineColor="#666666"/>
</box>
@ -448,7 +371,7 @@
<textFieldExpression><![CDATA[$F{nombpuntoventa}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" pattern="dd/MM/yyyy" isBlankWhenNull="true">
<reportElement stretchType="RelativeToTallestObject" x="0" y="0" width="52" height="14" uuid="0bc7de29-3141-475b-8c8f-759aa61ec086"/>
<reportElement uuid="0bc7de29-3141-475b-8c8f-759aa61ec086" stretchType="RelativeToTallestObject" x="0" y="0" width="52" height="14"/>
<box>
<bottomPen lineWidth="0.25" lineColor="#666666"/>
</box>
@ -466,7 +389,7 @@
<pageFooter>
<band height="19">
<textField>
<reportElement mode="Opaque" x="405" y="6" width="129" height="13" forecolor="#000000" backcolor="#E6E6E6" uuid="459669e8-6ea2-4f48-b249-be45842e3018"/>
<reportElement uuid="459669e8-6ea2-4f48-b249-be45842e3018" mode="Opaque" x="405" y="6" width="129" height="13" forecolor="#000000" backcolor="#E6E6E6"/>
<box>
<bottomPen lineWidth="0.25" lineColor="#666666"/>
</box>
@ -474,7 +397,7 @@
<textFieldExpression><![CDATA[$R{header.pagina}+" "+$V{PAGE_NUMBER}+" "+$R{header.de}]]></textFieldExpression>
</textField>
<textField pattern="EEEEE dd MMMMM yyyy">
<reportElement mode="Opaque" x="0" y="6" width="405" height="13" backcolor="#E6E6E6" uuid="cf46c42b-8cb7-451a-b5a1-78d62ea4f398"/>
<reportElement uuid="cf46c42b-8cb7-451a-b5a1-78d62ea4f398" mode="Opaque" x="0" y="6" width="405" height="13" backcolor="#E6E6E6"/>
<box>
<bottomPen lineWidth="0.25" lineColor="#666666"/>
</box>
@ -484,40 +407,19 @@
<textFieldExpression><![CDATA[new java.util.Date()]]></textFieldExpression>
</textField>
<textField evaluationTime="Report">
<reportElement mode="Opaque" x="534" y="6" width="41" height="13" backcolor="#E6E6E6" uuid="277c8da2-694c-4ece-8655-a586f2ec09b5"/>
<reportElement uuid="277c8da2-694c-4ece-8655-a586f2ec09b5" mode="Opaque" x="534" y="6" width="41" height="13" backcolor="#E6E6E6"/>
<box>
<bottomPen lineWidth="0.25" lineColor="#666666"/>
</box>
<textElement/>
<textFieldExpression><![CDATA[" " + $V{PAGE_NUMBER}]]></textFieldExpression>
</textField>
</band>
</pageFooter>
<summary>
<band height="14">
<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
<reportElement stretchType="RelativeToTallestObject" mode="Opaque" x="330" y="0" width="86" height="14" backcolor="#E6E6E6" uuid="a0c290ae-af70-4468-929c-0fecaaf21a77"/>
<box>
<bottomPen lineWidth="0.0" lineColor="#666666"/>
</box>
<textElement textAlignment="Right">
<font size="8" isBold="false"/>
<paragraph lineSpacing="Single"/>
</textElement>
<textFieldExpression><![CDATA[$V{fechamento_total}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
<reportElement stretchType="RelativeToTallestObject" mode="Opaque" x="416" y="0" width="68" height="14" backcolor="#E6E6E6" uuid="a3f5ae52-8b9d-40d9-a97b-b48959bc59da"/>
<box>
<bottomPen lineWidth="0.0" lineColor="#666666"/>
</box>
<textElement textAlignment="Right">
<font size="8" isBold="false"/>
<paragraph lineSpacing="Single"/>
</textElement>
<textFieldExpression><![CDATA[$V{saldo_total}]]></textFieldExpression>
</textField>
<band height="28">
<textField>
<reportElement mode="Opaque" x="0" y="0" width="262" height="14" backcolor="#E6E6E6" uuid="a92ccaaa-172c-45be-b475-7ad01db9d28f"/>
<reportElement uuid="a92ccaaa-172c-45be-b475-7ad01db9d28f" mode="Opaque" x="0" y="0" width="262" height="14" backcolor="#E6E6E6"/>
<box>
<bottomPen lineWidth="0.0" lineColor="#666666"/>
</box>
@ -528,7 +430,7 @@
<textFieldExpression><![CDATA[$R{footer.total}]]></textFieldExpression>
</textField>
<staticText>
<reportElement stretchType="RelativeToTallestObject" mode="Opaque" x="484" y="0" width="91" height="14" backcolor="#E6E6E6" uuid="7bf3ff2c-c4ad-4ee3-b30a-592a939b21e1"/>
<reportElement uuid="7bf3ff2c-c4ad-4ee3-b30a-592a939b21e1" stretchType="RelativeToTallestObject" mode="Opaque" x="330" y="0" width="245" height="14" backcolor="#E6E6E6"/>
<box>
<bottomPen lineWidth="0.0" lineColor="#666666"/>
</box>
@ -539,7 +441,7 @@
<text><![CDATA[]]></text>
</staticText>
<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
<reportElement stretchType="RelativeToTallestObject" mode="Opaque" x="262" y="0" width="68" height="14" backcolor="#E6E6E6" uuid="f7213305-9851-4224-805d-ae2a92cfa701"/>
<reportElement uuid="f7213305-9851-4224-805d-ae2a92cfa701" stretchType="RelativeToTallestObject" mode="Opaque" x="262" y="0" width="68" height="14" backcolor="#E6E6E6"/>
<box>
<bottomPen lineWidth="0.0" lineColor="#666666"/>
</box>
@ -549,12 +451,24 @@
</textElement>
<textFieldExpression><![CDATA[$V{deposito_total}]]></textFieldExpression>
</textField>
<textField>
<reportElement uuid="89065d08-2004-418a-86bd-999352ee3115" mode="Opaque" x="0" y="15" width="575" height="13" backcolor="#E6E6E6"/>
<box>
<bottomPen lineWidth="0.25" lineColor="#666666"/>
</box>
<textElement verticalAlignment="Middle">
<font size="8" isBold="true"/>
<paragraph lineSpacing="Single"/>
</textElement>
<textFieldExpression><![CDATA["Total Fechamento Geral: " + new DecimalFormat("#,##0.00").format($P{TOTAL_FECHAMENTO_GERAL}) + " / Total Pendente Geral: " + new DecimalFormat("#,##0.00").format($P{TOTAL_PENDENTE_GERAL})]]></textFieldExpression>
</textField>
</band>
</summary>
<noData>
<band height="14">
<textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement stretchType="RelativeToTallestObject" x="0" y="0" width="575" height="14" forecolor="#333333" uuid="f6f193c9-6da4-4334-aeb2-362a6af587cf"/>
<reportElement uuid="f6f193c9-6da4-4334-aeb2-362a6af587cf" stretchType="RelativeToTallestObject" x="0" y="0" width="575" height="14" forecolor="#333333"/>
<textElement/>
<textFieldExpression><![CDATA[$R{msg.noData}]]></textFieldExpression>
</textField>
</band>

View File

@ -15,6 +15,7 @@ public class RelatorioDepositoBean implements Comparable {
private String numpuntoventa;
private String codigoInstFinanceira;
private String nomeInstFinanceira;
private Long fechamentocntcorrenteId;
public String getCodigoInstFinanceira() {
return codigoInstFinanceira;
@ -80,7 +81,15 @@ public class RelatorioDepositoBean implements Comparable {
public void setNumpuntoventa(String numpuntoventa) {
this.numpuntoventa = numpuntoventa;
}
public Long getFechamentocntcorrenteId() {
return fechamentocntcorrenteId;
}
public void setFechamentocntcorrenteId(Long fechamentocntcorrenteId) {
this.fechamentocntcorrenteId = fechamentocntcorrenteId;
}
@Override
public int compareTo(Object o) {
if(o == null) {

View File

@ -45,6 +45,7 @@ public class RelatorioDepositosController extends MyGenericForwardComposer {
public void doAfterCompose(Component comp) throws Exception {
super.doAfterCompose(comp);
chkFiltrarPendentes.setChecked(true);
chkClassificarBanco.setDisabled(false);
}
private void executarRelatorio() throws Exception {