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

Merge pull request 'fixes bug#AL-4761' (!740) from AL-4761 into master 

Reviewed-on: http://18.235.188.113:3000/adm/VentaBoletosAdm/pulls/740
Reviewed-by: Gleison da Cruz <gleison.cruz@totvs.com.br>
Reviewed-by: Valdir Cordeiro <valdir.cordeiro@totvs.com.br>
master
Célio de Souza Ribeiro JR 2024-09-26 21:20:41 +00:00
parent cce68e28f1 d20d36f887
commit 72588b5969
3 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -117,8 +117,9 @@ public class RelatorioFormaPagamentoAgenciaNovo extends RelatorioDemandas {
BigDecimal seguroOPC = rset.getBigDecimal("seg_opcional"); BigDecimal seguroOPC = rset.getBigDecimal("seg_opcional");
BigDecimal taxa = rset.getBigDecimal("taxa"); BigDecimal taxa = rset.getBigDecimal("taxa");
BigDecimal valor = rset.getBigDecimal("valor"); BigDecimal valor = rset.getBigDecimal("valor");
String formaPagamento = rset.getString("forma_pagamento"); String formaPagamento = StringUtils.isEmpty(rset.getString("forma_pagamento")) ? StringUtils.EMPTY : rset.getString("forma_pagamento");
String formaPagamentoOriginal = rset.getString("forma_pago_original"); String formaPagamentoOriginal = StringUtils.isEmpty(rset.getString("forma_pago_original")) ? StringUtils.EMPTY : rset.getString("forma_pago_original");
Boolean isFormaPagamentoIguais = formaPagamento.equals(formaPagamentoOriginal);
dataResult.put("DATA", rset.getDate("data")); dataResult.put("DATA", rset.getDate("data"));
dataResult.put("BILHETE", rset.getString("bilhete")); dataResult.put("BILHETE", rset.getString("bilhete"));
@ -137,7 +138,7 @@ public class RelatorioFormaPagamentoAgenciaNovo extends RelatorioDemandas {
dataResult.put("SEG_OPCIONAL", seguroOPC.compareTo(BigDecimal.ZERO) == 0 ? seguroOPC : seguroOPC.negate()); dataResult.put("SEG_OPCIONAL", seguroOPC.compareTo(BigDecimal.ZERO) == 0 ? seguroOPC : seguroOPC.negate());
dataResult.put("TAXA", taxa.compareTo(BigDecimal.ZERO) == 0 ? taxa : taxa.negate()); dataResult.put("TAXA", taxa.compareTo(BigDecimal.ZERO) == 0 ? taxa : taxa.negate());
dataResult.put("VALOR", valor.compareTo(BigDecimal.ZERO) == 0 ? valor : valor.negate()); dataResult.put("VALOR", valor.compareTo(BigDecimal.ZERO) == 0 ? valor : valor.negate());
} else { } else if (isFormaPagamentoIguais){
dataResult.put("FORMA_PAGAMENTO", formaPagamento); dataResult.put("FORMA_PAGAMENTO", formaPagamento);
dataResult.put("TARIFA", tarifa); dataResult.put("TARIFA", tarifa);
dataResult.put("PEDAGIO", pedagio); dataResult.put("PEDAGIO", pedagio);

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

Binary file not shown.

8
src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioFormaPagamentoAgenciaNovo.jrxml
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-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="RelatorioFormaPagamentoAgenciaNovo" pageWidth="842" pageHeight="595" orientation="Landscape" whenNoDataType="NoDataSection" columnWidth="802" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20" isFloatColumnFooter="true" uuid="832cc8a2-6330-4063-9b36-f96514ae8283"> <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="RelatorioFormaPagamentoAgenciaNovo" pageWidth="842" pageHeight="595" orientation="Landscape" whenNoDataType="NoDataSection" columnWidth="802" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20" isFloatColumnFooter="true" uuid="832cc8a2-6330-4063-9b36-f96514ae8283">
<property name="ireport.zoom" value="2.5937424601000147"/> <property name="ireport.zoom" value="2.5937424601000147"/>
<property name="ireport.x" value="574"/> <property name="ireport.x" value="0"/>
<property name="ireport.y" value="0"/> <property name="ireport.y" value="0"/>
<property name="net.sf.jasperreports.export.xls.exclude.origin.band.2" value="title"/> <property name="net.sf.jasperreports.export.xls.exclude.origin.band.2" value="title"/>
<property name="net.sf.jasperreports.export.xls.exclude.origin.band.3" value="pageHeader"/> <property name="net.sf.jasperreports.export.xls.exclude.origin.band.3" value="pageHeader"/>
@ -71,7 +71,7 @@
<groupHeader> <groupHeader>
<band height="30"> <band height="30">
<textField> <textField>
<reportElement x="0" y="0" width="90" height="15" uuid="29bb0167-21cd-401c-94d9-f94bb1e9b9e4"> <reportElement x="0" y="0" width="100" height="15" uuid="29bb0167-21cd-401c-94d9-f94bb1e9b9e4">
<property name="com.jaspersoft.studio.unit.height" value="px"/> <property name="com.jaspersoft.studio.unit.height" value="px"/>
</reportElement> </reportElement>
<box> <box>
@ -82,8 +82,8 @@
</textElement> </textElement>
<textFieldExpression><![CDATA[$R{AGENCIA}]]></textFieldExpression> <textFieldExpression><![CDATA[$R{AGENCIA}]]></textFieldExpression>
</textField> </textField>
<textField isBlankWhenNull="true"> <textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement stretchType="RelativeToTallestObject" x="90" y="0" width="711" height="15" isPrintWhenDetailOverflows="true" uuid="e873a0b8-5b07-4883-8be6-edf75307e9ab"> <reportElement x="100" y="0" width="701" height="15" isPrintWhenDetailOverflows="true" uuid="e873a0b8-5b07-4883-8be6-edf75307e9ab">
<property name="com.jaspersoft.studio.unit.height" value="px"/> <property name="com.jaspersoft.studio.unit.height" value="px"/>
</reportElement> </reportElement>
<box> <box>