gleimar 2012-08-16 21:06:25 +00:00
parent 07337ca187
commit ac5ab53ba4
2 changed files with 12 additions and 45 deletions

View File

@ -19,6 +19,7 @@ import javax.persistence.Id;
import javax.persistence.JoinColumn; import javax.persistence.JoinColumn;
import javax.persistence.ManyToOne; import javax.persistence.ManyToOne;
import javax.persistence.OneToMany; import javax.persistence.OneToMany;
import javax.persistence.OneToOne;
import javax.persistence.SequenceGenerator; import javax.persistence.SequenceGenerator;
import javax.persistence.Table; import javax.persistence.Table;
import javax.persistence.Temporal; import javax.persistence.Temporal;
@ -34,6 +35,14 @@ import javax.persistence.TemporalType;
@Table(name = "RUTA") @Table(name = "RUTA")
public class Ruta implements Serializable { public class Ruta implements Serializable {
public OrgaoConcedente getOrgaoConcedente() {
return orgaoConcedente;
}
public void setOrgaoConcedente(OrgaoConcedente orgaoConcedente) {
this.orgaoConcedente = orgaoConcedente;
}
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@Id @Id
@Basic(optional = false) @Basic(optional = false)
@ -67,6 +76,9 @@ public class Ruta implements Serializable {
private String prefixo; private String prefixo;
@Column(name = "PREFIXOAUXILIAR") @Column(name = "PREFIXOAUXILIAR")
private String prefixoAuxiliar; private String prefixoAuxiliar;
@OneToOne
@JoinColumn(name = "ORGAOCONCEDENTE_ID")
private OrgaoConcedente orgaoConcedente;
public Boolean getIndNombreObligatorio() { public Boolean getIndNombreObligatorio() {
return indNombreObligatorio; return indNombreObligatorio;

View File

@ -62,12 +62,6 @@ public class TarifaOficial implements Serializable {
private VigenciaTarifa vigenciaTarifa; private VigenciaTarifa vigenciaTarifa;
@Column(name = "PRECIOREDABIERTO") @Column(name = "PRECIOREDABIERTO")
private BigDecimal precioredabierto; private BigDecimal precioredabierto;
@OneToMany(cascade = CascadeType.ALL)
@JoinColumn(name = "TARIFA_ID", referencedColumnName = "TARIFA_ID")
private List<TarifaTipoptovta> lsTarifaTipoptovta;
@OneToMany(cascade = CascadeType.ALL)
@JoinColumn(name = "TARIFA_ID", referencedColumnName = "TARIFA_ID")
private List<TarifaCategoria> lsTarifaCategoria;
@OneToOne @OneToOne
@JoinColumn(name = "ORIGEN_ID") @JoinColumn(name = "ORIGEN_ID")
private Parada origen; private Parada origen;
@ -211,45 +205,6 @@ public class TarifaOficial implements Serializable {
this.precioredabierto = precioredabierto; this.precioredabierto = precioredabierto;
} }
public List<TarifaCategoria> getLsTarifaCategoria() {
List<TarifaCategoria> tmp = new ArrayList<TarifaCategoria>();
if (lsTarifaCategoria != null) {
for (TarifaCategoria ddab : this.lsTarifaCategoria) {
if (ddab.getActivo()) {
tmp.add(ddab);
}
}
}
this.lsTarifaCategoria = tmp;
return tmp;
}
public void setLsTarifaCategoria(List<TarifaCategoria> lsTarifaCategoria) {
this.lsTarifaCategoria = lsTarifaCategoria;
}
public List<TarifaTipoptovta> getLsTarifaTipoptovta() {
List<TarifaTipoptovta> tmp = new ArrayList<TarifaTipoptovta>();
if (lsTarifaTipoptovta != null) {
for (TarifaTipoptovta ddab : this.lsTarifaTipoptovta) {
if (ddab.getActivo()) {
tmp.add(ddab);
}
}
}
this.lsTarifaTipoptovta = tmp;
return tmp;
}
public void setLsTarifaTipoptovta(List<TarifaTipoptovta> lsTarifaTipoptovta) {
this.lsTarifaTipoptovta = lsTarifaTipoptovta;
}
public Parada getOrigen() { public Parada getOrigen() {
return origen; return origen;
} }