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

Fixes bug #10152 

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@76383 d1611594-4594-4d17-8e1d-87c2c4800839
master
fabio 2017-11-14 11:45:34 +00:00
parent 4e34258eeb
commit 037d93fbbd
3 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioCancelamentoAutomaticoECF.java
View File

@ -53,7 +53,8 @@ public class RelatorioCancelamentoAutomaticoECF extends Relatorio {
sql.append(" fr4.NUMSERIE20 AS impressora, ");
sql.append(" e.NOMBEMPRESA AS empresa, ");
sql.append(" fp.DESCPAGO AS formaPagamento, ");
sql.append(" ROUND((100 * cfp.importe) / (coalesce(c.preciopagado,0)+coalesce(c.importetaxaembarque,0)+coalesce(c.importeseguro,0)+coalesce(c.importepedagio,0)+coalesce(c.importeoutros,0)),2) as porcentagem , ");
sql.append(" cfp.importe AS dividendo, ");
sql.append(" (coalesce(c.preciopagado,0)+coalesce(c.importetaxaembarque,0)+coalesce(c.importeseguro,0)+coalesce(c.importepedagio,0)+coalesce(c.importeoutros,0)) AS divisor , ");
sql.append(" ct.NSU AS nsu, ");
sql.append(" ct.NUMAUTORIZACION AS autorizacao ");
sql.append(" FROM caja c ");
@ -131,7 +132,12 @@ public class RelatorioCancelamentoAutomaticoECF extends Relatorio {
dataResult.put("impressora", rset.getString("impressora"));
dataResult.put("empresa", rset.getString("empresa"));
dataResult.put("formaPagamento", rset.getString("formaPagamento"));
dataResult.put("porcentagem", rset.getString("porcentagem"));
Double dividendo = rset.getDouble("dividendo");
Double divisor = rset.getDouble("divisor")==0.0 ?1:rset.getDouble("divisor");
Double porcentagem = dividendo*100 / divisor;
dataResult.put("porcentagem", porcentagem.toString());
dataResult.put("nsu", rset.getString("nsu"));
dataResult.put("autorizacao", rset.getString("autorizacao"));
this.dados.add(dataResult);

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

Binary file not shown.

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

@ -1,10 +1,12 @@
<?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="RelatorioAidfDetalhado" pageWidth="1561" pageHeight="595" orientation="Landscape" whenNoDataType="NoDataSection" columnWidth="1521" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20" uuid="c092ef85-9334-4225-93d7-1acb7cf4d021">
<property name="ireport.zoom" value="1.5"/>
<property name="ireport.x" value="562"/>
<property name="ireport.x" value="0"/>
<property name="ireport.y" value="11"/>
<property name="net.sf.jasperreports.export.xls.exclude.origin.keep.first.band.2" value="pageHeader"/>
<property name="net.sf.jasperreports.export.xls.exclude.origin.keep.first.band.1" value="columnHeader"/>
<property name="net.sf.jasperreports.export.xls.exclude.origin.band.2" value="pageHeader"/>
<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"/>
<parameter name="NOME_RELATORIO" class="java.lang.String"/>
<parameter name="DATA_INICIAL" class="java.util.Date"/>
<parameter name="DATA_FINAL" class="java.util.Date"/>