diff --git a/buisnesslogic/src/main/java/com/plannaplan/entities/Assignment.java b/buisnesslogic/src/main/java/com/plannaplan/entities/Assignment.java index 72e52f8..99dd236 100755 --- a/buisnesslogic/src/main/java/com/plannaplan/entities/Assignment.java +++ b/buisnesslogic/src/main/java/com/plannaplan/entities/Assignment.java @@ -16,8 +16,8 @@ public class Assignment { @JoinColumn(name = "group_id") private Groups group; @ManyToOne - @JoinColumn(name = "user_id") - private User user; + @JoinColumn(name = "commision_id") + private Commision commision; public Assignment() { } diff --git a/buisnesslogic/src/main/java/com/plannaplan/entities/Commision.java b/buisnesslogic/src/main/java/com/plannaplan/entities/Commision.java new file mode 100755 index 0000000..9f93ccf --- /dev/null +++ b/buisnesslogic/src/main/java/com/plannaplan/entities/Commision.java @@ -0,0 +1,33 @@ +package com.plannaplan.entities; + +import java.sql.Timestamp; + +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.JoinColumn; +import javax.persistence.ManyToOne; + +@Entity +public class Commision { + @Id + @GeneratedValue(strategy = GenerationType.AUTO) + private Long id; + @ManyToOne + @JoinColumn(name = "owner_id") + private User commisionOwner; + private Timestamp commisionDate; + + public Commision() { + } + + public Timestamp getCommisionDate() { + return commisionDate; + } + + public User getCommisionOwner() { + return commisionOwner; + } + +}