From bd6f77789814d866ddfc264283a2163b81811d01 Mon Sep 17 00:00:00 2001 From: leonardo Date: Thu, 27 Jul 2017 19:31:36 +0000 Subject: [PATCH] fixes bug #9339 git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Model/trunk/modelWeb@71978 d1611594-4594-4d17-8e1d-87c2c4800839 --- .../ventaboletos/entidad/Tramo.java | 16 ++++++++++++++++ .../service/impl/TramoRutaServiceImpl.java | 1 + 2 files changed, 17 insertions(+) diff --git a/src/com/rjconsultores/ventaboletos/entidad/Tramo.java b/src/com/rjconsultores/ventaboletos/entidad/Tramo.java index 58c31140f..1ddfcaa69 100644 --- a/src/com/rjconsultores/ventaboletos/entidad/Tramo.java +++ b/src/com/rjconsultores/ventaboletos/entidad/Tramo.java @@ -81,12 +81,16 @@ public class Tramo implements Serializable { @OneToMany(cascade = CascadeType.ALL) @JoinColumn(name = "TRAMO_ID", referencedColumnName = "TRAMO_ID") private List lsOrgaoTramo; + @Column(name = "CANTKMENTRADASAIDA") + private BigDecimal kmEntradaSaida; public Tramo() { + this.kmEntradaSaida = BigDecimal.ZERO; } public Tramo(Integer tramoId) { this.tramoId = tramoId; + this.kmEntradaSaida = BigDecimal.ZERO; } public Integer getTramoId() { @@ -240,11 +244,23 @@ public class Tramo implements Serializable { public BigDecimal getKmReal() { return kmReal; } + + public BigDecimal getKmRealSemKmEntradaSaida(){ + return kmReal.subtract(kmEntradaSaida); + } public void setKmReal(BigDecimal kmReal) { this.kmReal = kmReal; } + public BigDecimal getKmEntradaSaida() { + return kmEntradaSaida; + } + + public void setKmEntradaSaida(BigDecimal kmEntradaSaida) { + this.kmEntradaSaida = kmEntradaSaida; + } + public List getLsOrgaoTramo() { List tmp = new ArrayList(); for (OrgaoTramo orgaoTramo : this.lsOrgaoTramo) { diff --git a/src/com/rjconsultores/ventaboletos/service/impl/TramoRutaServiceImpl.java b/src/com/rjconsultores/ventaboletos/service/impl/TramoRutaServiceImpl.java index 175bf6dbe..df2313b00 100644 --- a/src/com/rjconsultores/ventaboletos/service/impl/TramoRutaServiceImpl.java +++ b/src/com/rjconsultores/ventaboletos/service/impl/TramoRutaServiceImpl.java @@ -166,6 +166,7 @@ public class TramoRutaServiceImpl implements TramoRutaService { tramo.setOrigem(s.getOrigen()); tramo.setDestino(s.getDestino()); tramo.setKmReal(s.getKmReal()); + tramo.setKmEntradaSaida(s.getKmEntradaSaida()); tramo.setVia(s.getVia()); tramo.setActivo(Boolean.TRUE); tramo.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId());