1 files changed, 6 insertions, 4 deletions

diff --git a/EjercitarJPA/src/model/Concepto.java b/EjercitarJPA/src/model/Concepto.java
index af2e8b9..a8cb860 100644
--- a/EjercitarJPA/src/model/Concepto.java
+++ b/EjercitarJPA/src/model/Concepto.java
@@ -17,7 +17,6 @@ import javax.persistence.JoinTable;
 import javax.persistence.ManyToMany;

 import javax.persistence.NamedQueries;

 import javax.persistence.NamedQuery;

-import javax.persistence.OneToMany;

 import javax.persistence.Table;

 import javax.validation.constraints.NotNull;

 import javax.validation.constraints.Size;

@@ -29,7 +28,7 @@ import javax.xml.bind.annotation.XmlTransient;
  * @author Ceci

  */

 @Entity

-@Table(name = "CONCEPTO")

+@Table(name = "concepto")

 @XmlRootElement

 @NamedQueries({

     @NamedQuery(name = "Concepto.findAll", query = "SELECT c FROM Concepto c"),

@@ -53,12 +52,15 @@ public class Concepto implements Serializable {
     @Size(min = 1, max = 2147483647)

     @Column(name = "descripcion")

     private String descripcion;

-    @JoinTable(name = "EJERCICIO_CONCEPTO", joinColumns = {

+    @JoinTable(name = "ejercicio_concepto", joinColumns = {

         @JoinColumn(name = "id_concepto", referencedColumnName = "id_concepto")}, inverseJoinColumns = {

         @JoinColumn(name = "id_ejercicio", referencedColumnName = "id_ejercicio")})

     @ManyToMany

     private List<Ejercicio> ejercicioList;

-    @OneToMany(mappedBy = "idConcepto")

+    @JoinTable(name = "tema_concepto", joinColumns = {

+        @JoinColumn(name = "id_concepto", referencedColumnName = "id_concepto")}, inverseJoinColumns = {

+        @JoinColumn(name = "id_tema", referencedColumnName = "id_tema")})

+    @ManyToMany

     private List<Tema> temaList;

 

     public Concepto() {