Merge branch '47-statuses' into 'master'
Resolve "Дополнительные статусы" Closes #47 See merge request romanov73/ng-tracker!23
This commit is contained in:
commit
7dc34e1a82
@ -1,5 +1,7 @@
|
||||
package ru.ulstu.paper.model;
|
||||
|
||||
import org.hibernate.annotations.Fetch;
|
||||
import org.hibernate.annotations.FetchMode;
|
||||
import org.hibernate.validator.constraints.NotBlank;
|
||||
import ru.ulstu.core.model.BaseEntity;
|
||||
import ru.ulstu.core.model.UserContainer;
|
||||
@ -16,10 +18,9 @@ import javax.persistence.FetchType;
|
||||
import javax.persistence.JoinColumn;
|
||||
import javax.persistence.ManyToMany;
|
||||
import javax.persistence.ManyToOne;
|
||||
import javax.persistence.OneToMany;
|
||||
import javax.persistence.Temporal;
|
||||
import javax.persistence.TemporalType;
|
||||
import javax.persistence.OneToMany;
|
||||
import javax.validation.constraints.NotNull;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Comparator;
|
||||
import java.util.Date;
|
||||
@ -33,9 +34,11 @@ public class Paper extends BaseEntity implements UserContainer {
|
||||
public enum PaperStatus {
|
||||
ATTENTION("Обратить внимание"),
|
||||
ON_PREPARATION("На подготовке"),
|
||||
ON_REVIEW("На проверке"),
|
||||
ON_REVIEW("Отправлена на проверку"),
|
||||
ACCEPTED("Принята"),
|
||||
NOT_ACCEPTED("Не принята"),
|
||||
COMPLETED("Завершена (опубликована)"),
|
||||
DRAFT("Черновик"),
|
||||
COMPLETED("Завершена"),
|
||||
FAILED("Провалены сроки");
|
||||
|
||||
private String statusName;
|
||||
@ -64,7 +67,8 @@ public class Paper extends BaseEntity implements UserContainer {
|
||||
private Date updateDate = new Date();
|
||||
|
||||
@OneToMany(cascade = CascadeType.ALL, fetch = FetchType.EAGER)
|
||||
@JoinColumn(name = "paper_id")
|
||||
@JoinColumn(name = "paper_id", unique = true)
|
||||
@Fetch(FetchMode.SUBSELECT)
|
||||
private List<Deadline> deadlines = new ArrayList<>();
|
||||
|
||||
private String comment;
|
||||
|
Loading…
Reference in New Issue
Block a user