|
|
@ -1,8 +1,7 @@
|
|
|
|
package ru.ulstu.paper.model;
|
|
|
|
package ru.ulstu.paper.model;
|
|
|
|
|
|
|
|
|
|
|
|
import com.fasterxml.jackson.annotation.JsonCreator;
|
|
|
|
|
|
|
|
import com.fasterxml.jackson.annotation.JsonProperty;
|
|
|
|
|
|
|
|
import org.hibernate.validator.constraints.NotEmpty;
|
|
|
|
import org.hibernate.validator.constraints.NotEmpty;
|
|
|
|
|
|
|
|
import org.springframework.format.annotation.DateTimeFormat;
|
|
|
|
import ru.ulstu.user.model.UserDto;
|
|
|
|
import ru.ulstu.user.model.UserDto;
|
|
|
|
|
|
|
|
|
|
|
|
import javax.validation.constraints.NotNull;
|
|
|
|
import javax.validation.constraints.NotNull;
|
|
|
@ -20,6 +19,7 @@ public class PaperDto {
|
|
|
|
private Date createDate;
|
|
|
|
private Date createDate;
|
|
|
|
private Date updateDate;
|
|
|
|
private Date updateDate;
|
|
|
|
@NotNull
|
|
|
|
@NotNull
|
|
|
|
|
|
|
|
@DateTimeFormat(pattern = "yyyy-MM-dd")
|
|
|
|
private Date deadlineDate;
|
|
|
|
private Date deadlineDate;
|
|
|
|
private String comment;
|
|
|
|
private String comment;
|
|
|
|
private Boolean locked;
|
|
|
|
private Boolean locked;
|
|
|
@ -32,32 +32,6 @@ public class PaperDto {
|
|
|
|
public PaperDto() {
|
|
|
|
public PaperDto() {
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
@JsonCreator
|
|
|
|
|
|
|
|
public PaperDto(@JsonProperty("id") Integer id,
|
|
|
|
|
|
|
|
@JsonProperty("title") String title,
|
|
|
|
|
|
|
|
@JsonProperty("status") Paper.PaperStatus status,
|
|
|
|
|
|
|
|
@JsonProperty("createDate") Date createDate,
|
|
|
|
|
|
|
|
@JsonProperty("updateDate") Date updateDate,
|
|
|
|
|
|
|
|
@JsonProperty("deadlineDate") Date deadlineDate,
|
|
|
|
|
|
|
|
@JsonProperty("comment") String comment,
|
|
|
|
|
|
|
|
@JsonProperty("locked") Boolean locked,
|
|
|
|
|
|
|
|
@JsonProperty("tmpFileName") String tmpFileName,
|
|
|
|
|
|
|
|
@JsonProperty("authors") Set<UserDto> authors) {
|
|
|
|
|
|
|
|
this.id = id;
|
|
|
|
|
|
|
|
this.title = title;
|
|
|
|
|
|
|
|
this.status = status;
|
|
|
|
|
|
|
|
this.createDate = createDate;
|
|
|
|
|
|
|
|
this.updateDate = updateDate;
|
|
|
|
|
|
|
|
this.deadlineDate = deadlineDate;
|
|
|
|
|
|
|
|
this.comment = comment;
|
|
|
|
|
|
|
|
this.locked = locked;
|
|
|
|
|
|
|
|
this.tmpFileName = tmpFileName;
|
|
|
|
|
|
|
|
this.fileId = null;
|
|
|
|
|
|
|
|
this.fileName = null;
|
|
|
|
|
|
|
|
this.fileCreateDate = null;
|
|
|
|
|
|
|
|
this.authors = authors;
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
public PaperDto(Paper paper) {
|
|
|
|
public PaperDto(Paper paper) {
|
|
|
|
this.id = paper.getId();
|
|
|
|
this.id = paper.getId();
|
|
|
|
this.title = paper.getTitle();
|
|
|
|
this.title = paper.getTitle();
|
|
|
@ -126,6 +100,58 @@ public class PaperDto {
|
|
|
|
return authors;
|
|
|
|
return authors;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
public void setId(Integer id) {
|
|
|
|
|
|
|
|
this.id = id;
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
public void setTitle(String title) {
|
|
|
|
|
|
|
|
this.title = title;
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
public void setStatus(Paper.PaperStatus status) {
|
|
|
|
|
|
|
|
this.status = status;
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
public void setCreateDate(Date createDate) {
|
|
|
|
|
|
|
|
this.createDate = createDate;
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
public void setUpdateDate(Date updateDate) {
|
|
|
|
|
|
|
|
this.updateDate = updateDate;
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
public void setDeadlineDate(Date deadlineDate) {
|
|
|
|
|
|
|
|
this.deadlineDate = deadlineDate;
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
public void setComment(String comment) {
|
|
|
|
|
|
|
|
this.comment = comment;
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
public void setLocked(Boolean locked) {
|
|
|
|
|
|
|
|
this.locked = locked;
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
public void setTmpFileName(String tmpFileName) {
|
|
|
|
|
|
|
|
this.tmpFileName = tmpFileName;
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
public void setFileId(Integer fileId) {
|
|
|
|
|
|
|
|
this.fileId = fileId;
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
public void setFileName(String fileName) {
|
|
|
|
|
|
|
|
this.fileName = fileName;
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
public void setFileCreateDate(Date fileCreateDate) {
|
|
|
|
|
|
|
|
this.fileCreateDate = fileCreateDate;
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
public void setAuthors(Set<UserDto> authors) {
|
|
|
|
|
|
|
|
this.authors = authors;
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
public String getAuthorsString() {
|
|
|
|
public String getAuthorsString() {
|
|
|
|
return authors
|
|
|
|
return authors
|
|
|
|
.stream()
|
|
|
|
.stream()
|
|
|
|