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

0014274: Chamado 76960 - Relatório Fechamento Conta Corrente / Depósitos com erro - GLPI 13017 

fixes bug#14274
dev:Aristides
qua:Juliane

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@92971 d1611594-4594-4d17-8e1d-87c2c4800839
master
fabricio.oliveira 2019-05-07 22:28:05 +00:00
parent 0e68eb10fb
commit c3db73f21a
4 changed files with 27 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -80,9 +80,9 @@ public class RelatorioDepositos extends Relatorio {
Collections.sort(lsDadosRelatorio);
if (lsDadosRelatorio.size() > 0) {
if(filtrarPendentes) {
lsDadosRelatorio = removeFechamentosZerados(lsDadosRelatorio);
}
// if(filtrarPendentes) {
// lsDadosRelatorio = removeFechamentosZerados(lsDadosRelatorio);
// }
setLsDadosRelatorio(lsDadosRelatorio);
}
setNomeSubReporte(nomeSubReporte);
@ -163,7 +163,8 @@ public class RelatorioDepositos extends Relatorio {
sql.append(" SUM(NVL(fd.valor_pago,0)) AS vrfechamento , ");
sql.append(" f.total AS vrdeposito, ");
sql.append(" f.FECHAMENTOCNTCORRENTE_ID, ");
sql.append(" fdp.NUMDEPOSITO as numdeposito, ");
// sql.append(" fdp.NUMDEPOSITO as numdeposito, ");
sql.append(" null as numdeposito, ");
sql.append(" ifin.CODIGO as codinstfin, ");
sql.append(" ifin.NOME as nomeinstfin ");
sql.append(" FROM fechamento_cntcorrente f ");
@ -206,7 +207,8 @@ public class RelatorioDepositos extends Relatorio {
sql.append(" f.fecfechamento, ");
sql.append(" f.FECHAMENTOCNTCORRENTE_ID, ");
sql.append(" f.total, ");
sql.append(" fdp.NUMDEPOSITO, ");
// sql.append(" fdp.NUMDEPOSITO, ");
sql.append(" null, ");
sql.append(" ifin.CODIGO, ");
sql.append(" ifin.NOME ) tmp ");
if (filtrarPendentes){

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

Binary file not shown.

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

@ -2,7 +2,7 @@
<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.4641000000000006"/>
<property name="ireport.x" value="0"/>
<property name="ireport.y" value="0"/>
<property name="ireport.y" value="42"/>
<parameter name="fecInicio" class="java.lang.String">
<defaultValueExpression><![CDATA[]]></defaultValueExpression>
</parameter>
@ -31,10 +31,10 @@
<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">
<variable name="DEPOSITO_BANCO" class="java.math.BigDecimal" resetType="Group" resetGroup="grupo_data_agencia" incrementType="Group" incrementGroup="grupo_data_agencia" calculation="Sum">
<variableExpression><![CDATA[$F{vrdeposito}]]></variableExpression>
</variable>
<variable name="VLFECHAMENTO_BANCO" class="java.math.BigDecimal" resetType="Group" resetGroup="grupoBanco" incrementType="Group" incrementGroup="grupo_data_agencia" calculation="Sum">
<variable name="VLFECHAMENTO_BANCO" class="java.math.BigDecimal" resetType="Group" resetGroup="grupo_data_agencia">
<variableExpression><![CDATA[$F{vrfechamento}]]></variableExpression>
</variable>
<variable name="PENDENTE_BANCO" class="java.math.BigDecimal" resetType="Group" resetGroup="grupoBanco" calculation="Sum">
@ -46,6 +46,9 @@
<variable name="verificaGrupoBanco" class="java.lang.String">
<variableExpression><![CDATA[$P{isClassificaPorBanco}==true?$F{nombpuntoventa}:""]]></variableExpression>
</variable>
<variable name="SOMA_VRDEPOSITO" class="java.math.BigDecimal" resetType="Group" resetGroup="grupo_data_agencia" calculation="Sum">
<variableExpression><![CDATA[$F{vrdeposito}]]></variableExpression>
</variable>
<group name="empresa">
<groupExpression><![CDATA[$F{nombempresa}]]></groupExpression>
<groupHeader>
@ -180,28 +183,36 @@
<groupFooter>
<band height="20">
<textField isStretchWithOverflow="true" pattern="¤ #,##0.00">
<reportElement x="281" y="0" width="68" height="20" isPrintWhenDetailOverflows="true" uuid="e2ba52ea-22ed-4d11-b11f-6f7831d57c43"/>
<reportElement x="281" y="0" width="68" height="20" isPrintWhenDetailOverflows="true" uuid="e2ba52ea-22ed-4d11-b11f-6f7831d57c43">
<printWhenExpression><![CDATA[new Boolean(false)]]></printWhenExpression>
</reportElement>
<textElement textAlignment="Right">
<font size="6" isBold="true"/>
</textElement>
<textFieldExpression><![CDATA[$V{DEPOSITO_BANCO}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" pattern="¤ #,##0.00">
<reportElement x="349" y="0" width="68" height="20" isPrintWhenDetailOverflows="true" uuid="695d6008-0322-46fd-9423-ec88ceaccdb9"/>
<reportElement x="349" y="0" width="68" height="20" isPrintWhenDetailOverflows="true" uuid="695d6008-0322-46fd-9423-ec88ceaccdb9">
<printWhenExpression><![CDATA[new Boolean(false)]]></printWhenExpression>
</reportElement>
<textElement textAlignment="Right">
<font size="6" isBold="true"/>
</textElement>
<textFieldExpression><![CDATA[$V{VLFECHAMENTO_BANCO}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" pattern="¤ #,##0.00">
<reportElement x="417" y="0" width="68" height="20" isPrintWhenDetailOverflows="true" uuid="a0492959-dfa8-4d34-b1ce-ff7a09b8b706"/>
<reportElement x="417" y="0" width="68" height="20" isPrintWhenDetailOverflows="true" uuid="a0492959-dfa8-4d34-b1ce-ff7a09b8b706">
<printWhenExpression><![CDATA[new Boolean(false)]]></printWhenExpression>
</reportElement>
<textElement textAlignment="Right">
<font size="6" isBold="true"/>
</textElement>
<textFieldExpression><![CDATA[$V{TOTAL_PENDENTE}]]></textFieldExpression>
</textField>
<staticText>
<reportElement x="0" y="0" width="65" height="17" uuid="303904b8-89e3-4223-b081-c9d61d305a29"/>
<reportElement x="0" y="0" width="65" height="17" uuid="303904b8-89e3-4223-b081-c9d61d305a29">
<printWhenExpression><![CDATA[new Boolean(false)]]></printWhenExpression>
</reportElement>
<textElement>
<font size="8" isBold="true"/>
<paragraph lineSpacing="Single"/>
@ -313,7 +324,7 @@
<textFieldExpression><![CDATA[$F{nombpuntoventa}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" pattern="¤ #,##0.00" isBlankWhenNull="true">
<reportElement stretchType="RelativeToTallestObject" x="281" y="0" width="68" height="17" uuid="c50e9a15-f55c-4859-b98b-f5181f95d614"/>
<reportElement stretchType="RelativeToTallestObject" x="281" y="0" width="68" height="17" printWhenGroupChanges="grupo_data_agencia" uuid="c50e9a15-f55c-4859-b98b-f5181f95d614"/>
<box>
<topPen lineWidth="0.5"/>
<leftPen lineWidth="0.5"/>
@ -366,7 +377,6 @@
<font size="8" isBold="true"/>
<paragraph lineSpacing="Single"/>
</textElement>
<textFieldExpression><![CDATA[$F{numdeposito}]]></textFieldExpression>
</textField>
<textField pattern="" isBlankWhenNull="true">
<reportElement stretchType="RelativeToTallestObject" x="0" y="0" width="65" height="17" uuid="4f651cd3-e07f-42d3-ba24-d0c2bcaa3460"/>

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

@ -98,10 +98,7 @@ public class RelatorioDepositoBean implements Comparable {
} else if (this.dtmotivo.compareTo(rdb.getDtmotivo()) != 0) {
return this.dtmotivo.compareTo(rdb.getDtmotivo());
} else if (this.numdeposito.compareTo(rdb.getNumdeposito()) != 0) {
return this.numdeposito.compareTo(rdb.getNumdeposito());
}
}
return 0;
}