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

Resolusão de conflitos

master
Fabio 2024-05-17 08:24:35 -03:00
parent 9f68dfad40 2b5e239805
commit 5f1ee62f2a
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@ -5,7 +5,7 @@
<groupId>br.com.rjconsultores</groupId>
<artifactId>ventaboletosadm</artifactId>
<version>1.77.0</version>
<packaging>war</packaging>
<packaging>war</packaging>
<properties>
<modelWeb.version>1.58.0</modelWeb.version>

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

@ -78,16 +78,15 @@ public class RelatorioDepositos extends Relatorio {
deposito.setNumpuntoventa(rs.getString("numpuntoventa"));
deposito.setDtmotivo(rs.getDate("dtmotivo"));
deposito.setVrfechamento(rs.getBigDecimal("vrfechamento"));
deposito.setSaldo(rs.getBigDecimal("saldo").multiply(BigDecimal.valueOf(-1)));
deposito.setEmpresaId(rs.getInt(EMPRESA_ID));
deposito.setPuntoventaId(rs.getInt(PUNTOVENTA_ID));
isBoletoQuitado = "1".equals(rs.getString("indboletoquitado")) ? true : false;
if (isBoletoQuitado) {
deposito.setSaldo(rs.getBigDecimal("saldo").multiply(BigDecimal.valueOf(-1)));
deposito.setVrdeposito(rs.getBigDecimal("vlrBoletoDeposito"));
} else {
deposito.setSaldo(rs.getBigDecimal("saldo").multiply(BigDecimal.valueOf(-1)));
deposito.setVrdeposito(rs.getBigDecimal("valordocumento"));
} else {
deposito.setVrdeposito(rs.getBigDecimal("vlrBoletoDeposito"));
}
if (! filtrarPendentes){