diff --git a/src/com/rjconsultores/ventaboletos/entidad/Ruta.java b/src/com/rjconsultores/ventaboletos/entidad/Ruta.java index f47919b9e..99bd70cfc 100644 --- a/src/com/rjconsultores/ventaboletos/entidad/Ruta.java +++ b/src/com/rjconsultores/ventaboletos/entidad/Ruta.java @@ -19,6 +19,7 @@ import javax.persistence.Id; import javax.persistence.JoinColumn; import javax.persistence.ManyToOne; import javax.persistence.OneToMany; +import javax.persistence.OneToOne; import javax.persistence.SequenceGenerator; import javax.persistence.Table; import javax.persistence.Temporal; @@ -34,6 +35,14 @@ import javax.persistence.TemporalType; @Table(name = "RUTA") public class Ruta implements Serializable { + public OrgaoConcedente getOrgaoConcedente() { + return orgaoConcedente; + } + + public void setOrgaoConcedente(OrgaoConcedente orgaoConcedente) { + this.orgaoConcedente = orgaoConcedente; + } + private static final long serialVersionUID = 1L; @Id @Basic(optional = false) @@ -67,6 +76,9 @@ public class Ruta implements Serializable { private String prefixo; @Column(name = "PREFIXOAUXILIAR") private String prefixoAuxiliar; + @OneToOne + @JoinColumn(name = "ORGAOCONCEDENTE_ID") + private OrgaoConcedente orgaoConcedente; public Boolean getIndNombreObligatorio() { return indNombreObligatorio; diff --git a/src/com/rjconsultores/ventaboletos/entidad/TarifaOficial.java b/src/com/rjconsultores/ventaboletos/entidad/TarifaOficial.java index 1263da7e2..9876f25e5 100644 --- a/src/com/rjconsultores/ventaboletos/entidad/TarifaOficial.java +++ b/src/com/rjconsultores/ventaboletos/entidad/TarifaOficial.java @@ -62,12 +62,6 @@ public class TarifaOficial implements Serializable { private VigenciaTarifa vigenciaTarifa; @Column(name = "PRECIOREDABIERTO") private BigDecimal precioredabierto; - @OneToMany(cascade = CascadeType.ALL) - @JoinColumn(name = "TARIFA_ID", referencedColumnName = "TARIFA_ID") - private List lsTarifaTipoptovta; - @OneToMany(cascade = CascadeType.ALL) - @JoinColumn(name = "TARIFA_ID", referencedColumnName = "TARIFA_ID") - private List lsTarifaCategoria; @OneToOne @JoinColumn(name = "ORIGEN_ID") private Parada origen; @@ -211,45 +205,6 @@ public class TarifaOficial implements Serializable { this.precioredabierto = precioredabierto; } - public List getLsTarifaCategoria() { - List tmp = new ArrayList(); - if (lsTarifaCategoria != null) { - for (TarifaCategoria ddab : this.lsTarifaCategoria) { - if (ddab.getActivo()) { - tmp.add(ddab); - } - } - } - - this.lsTarifaCategoria = tmp; - - return tmp; - } - - public void setLsTarifaCategoria(List lsTarifaCategoria) { - this.lsTarifaCategoria = lsTarifaCategoria; - } - - public List getLsTarifaTipoptovta() { - List tmp = new ArrayList(); - if (lsTarifaTipoptovta != null) { - for (TarifaTipoptovta ddab : this.lsTarifaTipoptovta) { - if (ddab.getActivo()) { - tmp.add(ddab); - } - } - } - - this.lsTarifaTipoptovta = tmp; - - return tmp; - } - - public void setLsTarifaTipoptovta(List lsTarifaTipoptovta) { - this.lsTarifaTipoptovta = lsTarifaTipoptovta; - } - - public Parada getOrigen() { return origen; }