From 45f0b0d964cc750681b18f3bc9f977cc69b8db71 Mon Sep 17 00:00:00 2001 From: "lucas.taia" Date: Tue, 30 May 2017 00:54:33 +0000 Subject: [PATCH] fixes bug #9035 git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Model/trunk/modelWeb@69427 d1611594-4594-4d17-8e1d-87c2c4800839 --- .../ventaboletos/entidad/RegionMetropolitana.java | 10 +++++----- .../ventaboletos/entidad/TarifaMinima.java | 15 +++++++++++++-- 2 files changed, 18 insertions(+), 7 deletions(-) diff --git a/src/com/rjconsultores/ventaboletos/entidad/RegionMetropolitana.java b/src/com/rjconsultores/ventaboletos/entidad/RegionMetropolitana.java index 4083da37d..fab7a650b 100644 --- a/src/com/rjconsultores/ventaboletos/entidad/RegionMetropolitana.java +++ b/src/com/rjconsultores/ventaboletos/entidad/RegionMetropolitana.java @@ -90,17 +90,17 @@ public class RegionMetropolitana implements Serializable { @Override public int hashCode() { int hash = 0; - hash += (getRegionMetropolitanaId() != null ? getRegionMetropolitanaId().hashCode() : 0); + hash += (regionMetropolitanaId != null ? regionMetropolitanaId.hashCode() : 0); return hash; } @Override public boolean equals(Object object) { - if (!(object instanceof Ruta)) { + if (!(object instanceof RegionMetropolitana)) { return false; } RegionMetropolitana other = (RegionMetropolitana) object; - if ((this.getRegionMetropolitanaId() == null && other.getRegionMetropolitanaId() != null) || (this.getRegionMetropolitanaId() != null && !this.getRegionMetropolitanaId().equals(other.getRegionMetropolitanaId()))) { + if ((regionMetropolitanaId == null && other.regionMetropolitanaId != null) || (this.regionMetropolitanaId != null && !this.regionMetropolitanaId.equals(other.regionMetropolitanaId))) { return false; } return true; @@ -108,8 +108,8 @@ public class RegionMetropolitana implements Serializable { @Override public String toString() { - if (getDescRegion() != null || getRegionMetropolitanaId() != null) { - return this.getDescRegion() + " - " + this.getRegionMetropolitanaId(); + if (getDescRegion() != null || regionMetropolitanaId != null) { + return this.getDescRegion() + " - " + regionMetropolitanaId; } return " "; } diff --git a/src/com/rjconsultores/ventaboletos/entidad/TarifaMinima.java b/src/com/rjconsultores/ventaboletos/entidad/TarifaMinima.java index 410897dc2..b122baebc 100644 --- a/src/com/rjconsultores/ventaboletos/entidad/TarifaMinima.java +++ b/src/com/rjconsultores/ventaboletos/entidad/TarifaMinima.java @@ -84,9 +84,13 @@ public class TarifaMinima implements Serializable { @ManyToOne private Ruta ruta; - @ManyToOne @JoinColumn(name = "REGIONMETROPOLITANA_ID", referencedColumnName = "REGIONMETROPOLITANA_ID") + @ManyToOne private RegionMetropolitana regionMetropolitana; + + @JoinColumn(name = "COEFICIENTETARIFA_ID", referencedColumnName = "COEFICIENTETARIFA_ID") + @ManyToOne + private CoeficienteTarifa coeficienteTarifa; public TarifaMinima() { } @@ -247,5 +251,12 @@ public class TarifaMinima implements Serializable { public void setRegionMetropolitana(RegionMetropolitana regionMetropolitana) { this.regionMetropolitana = regionMetropolitana; } - + + public CoeficienteTarifa getCoeficienteTarifa() { + return coeficienteTarifa; + } + + public void setCoeficienteTarifa(CoeficienteTarifa coeficienteTarifa) { + this.coeficienteTarifa = coeficienteTarifa; + } }