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

RLH - Homologação de Itens (2908) 

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@30813 d1611594-4594-4d17-8e1d-87c2c4800839
master
julio 2013-09-10 19:14:20 +00:00
parent d3a71b0c23
commit 800faa4bf1
4 changed files with 24 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioLinhasHorario.java
View File

@ -16,7 +16,6 @@ import com.rjconsultores.ventaboletos.entidad.Empresa;
import com.rjconsultores.ventaboletos.entidad.GrupoRuta;
import com.rjconsultores.ventaboletos.entidad.Ruta;
import com.rjconsultores.ventaboletos.relatorios.utilitarios.DataSource;
import com.rjconsultores.ventaboletos.relatorios.utilitarios.ProcessadorParametros;
import com.rjconsultores.ventaboletos.relatorios.utilitarios.Relatorio;
import com.rjconsultores.ventaboletos.relatorios.utilitarios.RelatorioLinhasHorarioBean;
import com.rjconsultores.ventaboletos.web.utilerias.NamedParameterStatement;
@ -76,8 +75,6 @@ public class RelatorioLinhasHorario extends Relatorio {
Integer tipoServico = (Integer) parametros.get("TIPOSERVICIO_ID");
String sql = getSql(lsNumLinha, lsNumServico, empresa, tipoServico, grupoRuta);
System.out.println(sql);
NamedParameterStatement stmt = new NamedParameterStatement(conexao, sql);
ResultSet rset = null;
@ -195,7 +192,10 @@ public class RelatorioLinhasHorario extends Relatorio {
totalPaxKMOfertado = totalPaxKMOfertado.add(horarioBean.getPaxKmOfertado() != null ? horarioBean.getPaxKmOfertado() : BigDecimal.ZERO);
totalPaxKMTransportado = totalPaxKMTransportado.add(horarioBean.getPaxKmTransportado() != null ? horarioBean.getPaxKmTransportado() : BigDecimal.ZERO);
totalIAP = totalIAP.add(horarioBean.getIap() != null ? horarioBean.getIap() : BigDecimal.ZERO);
// totalIAP = totalIAP.add(horarioBean.getIap() != null ? horarioBean.getIap() : BigDecimal.ZERO);
totalIAP = calcTotalIap(totalPaxKMTransportado, totalPaxKMOfertado);
}
@ -367,6 +367,21 @@ public class RelatorioLinhasHorario extends Relatorio {
return horarioBean;
}
private BigDecimal calcTotalIap(BigDecimal totalPaxKMTransportado, BigDecimal totalPaxKMOfertado) {
BigDecimal iap = null;
BigDecimal CENTO = BigDecimal.TEN.multiply(BigDecimal.TEN);
try {
iap = (totalPaxKMTransportado.multiply(CENTO)).divide(totalPaxKMOfertado, 2, RoundingMode.HALF_EVEN);
} catch (ArithmeticException e) {
iap = BigDecimal.ZERO;
} catch (NullPointerException nex) {
iap = BigDecimal.ZERO;
} catch (Exception ex) {
ex.printStackTrace();
}
return iap;
}
@Override
protected void processaParametros() throws Exception {
}

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

Binary file not shown.

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

@ -120,8 +120,8 @@
<variable name="paxKmTransportad_group" class="java.math.BigDecimal" resetType="Group" resetGroup="groupRuta" calculation="Sum">
<variableExpression><![CDATA[$F{paxKmTransportado}]]></variableExpression>
</variable>
<variable name="iap_group" class="java.math.BigDecimal" resetType="Group" resetGroup="groupRuta" calculation="Sum">
<variableExpression><![CDATA[$F{iap}]]></variableExpression>
<variable name="iap_group" class="java.math.BigDecimal" resetType="Group" resetGroup="groupRuta">
<variableExpression><![CDATA[$V{paxKmTransportad_group}.multiply(BigDecimal.TEN.multiply(BigDecimal.TEN)).divide($V{paxKmOfertado_group}, 2, 4)]]></variableExpression>
</variable>
<variable name="pedagio_group" class="java.math.BigDecimal" resetType="Group" resetGroup="groupTipoLinha" calculation="Sum">
<variableExpression><![CDATA[$F{pedagio}]]></variableExpression>
@ -192,8 +192,8 @@
<variable name="linha_paxKmTransportad_group" class="java.math.BigDecimal" resetType="Group" resetGroup="groupTipoLinha" incrementType="Group" incrementGroup="groupRuta" calculation="Sum">
<variableExpression><![CDATA[$V{paxKmTransportad_group}]]></variableExpression>
</variable>
<variable name="linha_iap_group" class="java.math.BigDecimal" resetType="Group" resetGroup="groupTipoLinha" incrementType="Group" incrementGroup="groupRuta" calculation="Sum">
<variableExpression><![CDATA[$V{iap_group}]]></variableExpression>
<variable name="linha_iap_group" class="java.math.BigDecimal" resetType="Group" resetGroup="groupTipoLinha" incrementType="Group" incrementGroup="groupRuta">
<variableExpression><![CDATA[$V{linha_paxKmTransportad_group}.multiply(BigDecimal.TEN.multiply(BigDecimal.TEN)).divide($V{linha_paxKmOfertado_group}, 2, 4)]]></variableExpression>
</variable>
<variable name="linha_media_rsViagem_group" class="java.math.BigDecimal" resetType="Group" resetGroup="groupTipoLinha">
<variableExpression><![CDATA[$V{linha_rsViagem_group}.divide( BigDecimal.valueOf($V{groupTipoLinha_COUNT}.longValue()), RoundingMode.HALF_EVEN )]]></variableExpression>

2
src/java/versionADM.info
View File

@ -1 +1 @@
ADM_20130910_1RC230
ADM_20130910_1RC231