diff --git a/pom.xml b/pom.xml index 106da4f40..26e078df5 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 br.com.rjconsultores ModelWeb - 1.6.8 + 1.6.9 rj-releases diff --git a/src/com/rjconsultores/ventaboletos/entidad/Convenio.java b/src/com/rjconsultores/ventaboletos/entidad/Convenio.java index afba3c800..5885d9d32 100644 --- a/src/com/rjconsultores/ventaboletos/entidad/Convenio.java +++ b/src/com/rjconsultores/ventaboletos/entidad/Convenio.java @@ -66,8 +66,7 @@ public class Convenio implements Serializable { @Column(name = "IMPRIMEPRECIO") private Short imprimeprecio; - @OneToMany(cascade = CascadeType.ALL) - @JoinColumn(name = "CONVENIO_ID", referencedColumnName = "CONVENIO_ID") + @OneToMany(mappedBy = "convenio", cascade = CascadeType.ALL) private List convenioDetList; @OneToMany(mappedBy = "convenio", cascade = CascadeType.ALL) diff --git a/src/com/rjconsultores/ventaboletos/entidad/ConvenioDet.java b/src/com/rjconsultores/ventaboletos/entidad/ConvenioDet.java index 994b81b87..228cd56b2 100644 --- a/src/com/rjconsultores/ventaboletos/entidad/ConvenioDet.java +++ b/src/com/rjconsultores/ventaboletos/entidad/ConvenioDet.java @@ -13,6 +13,8 @@ import javax.persistence.Entity; import javax.persistence.GeneratedValue; import javax.persistence.GenerationType; import javax.persistence.Id; +import javax.persistence.JoinColumn; +import javax.persistence.ManyToOne; import javax.persistence.SequenceGenerator; import javax.persistence.Table; import javax.persistence.Temporal; @@ -33,6 +35,9 @@ public class ConvenioDet implements Serializable { @Basic(optional = false) @Column(name = "CONVENIODET_ID") private Integer conveniodetId; + @JoinColumn(name = "CONVENIO_ID", referencedColumnName = "CONVENIO_ID") + @ManyToOne + private Convenio convenio; @Column(name = "PORCDESCUENTO") /* Refere-se ao desconto na tarifa */ private BigDecimal porcdescuento;