|
|
@ -6,7 +6,7 @@ import org.apache.commons.lang3.StringUtils;
|
|
|
|
import org.hibernate.validator.constraints.NotEmpty;
|
|
|
|
import org.hibernate.validator.constraints.NotEmpty;
|
|
|
|
import ru.ulstu.deadline.model.Deadline;
|
|
|
|
import ru.ulstu.deadline.model.Deadline;
|
|
|
|
import ru.ulstu.file.model.FileDataDto;
|
|
|
|
import ru.ulstu.file.model.FileDataDto;
|
|
|
|
import ru.ulstu.paper.model.Paper;
|
|
|
|
import ru.ulstu.paper.model.PaperDto;
|
|
|
|
import ru.ulstu.project.model.ProjectDto;
|
|
|
|
import ru.ulstu.project.model.ProjectDto;
|
|
|
|
import ru.ulstu.user.model.UserDto;
|
|
|
|
import ru.ulstu.user.model.UserDto;
|
|
|
|
|
|
|
|
|
|
|
@ -37,7 +37,7 @@ public class GrantDto {
|
|
|
|
private boolean hasBAKPapers;
|
|
|
|
private boolean hasBAKPapers;
|
|
|
|
private boolean hasScopusPapers;
|
|
|
|
private boolean hasScopusPapers;
|
|
|
|
private List<Integer> paperIds = new ArrayList<>();
|
|
|
|
private List<Integer> paperIds = new ArrayList<>();
|
|
|
|
private List<Paper> papers = new ArrayList<>();
|
|
|
|
private List<PaperDto> papers = new ArrayList<>();
|
|
|
|
private List<Integer> removedDeadlineIds = new ArrayList<>();
|
|
|
|
private List<Integer> removedDeadlineIds = new ArrayList<>();
|
|
|
|
|
|
|
|
|
|
|
|
public GrantDto() {
|
|
|
|
public GrantDto() {
|
|
|
@ -54,12 +54,12 @@ public class GrantDto {
|
|
|
|
@JsonProperty("project") ProjectDto project,
|
|
|
|
@JsonProperty("project") ProjectDto project,
|
|
|
|
@JsonProperty("authorIds") Set<Integer> authorIds,
|
|
|
|
@JsonProperty("authorIds") Set<Integer> authorIds,
|
|
|
|
@JsonProperty("authors") Set<UserDto> authors,
|
|
|
|
@JsonProperty("authors") Set<UserDto> authors,
|
|
|
|
@JsonProperty("leader") Integer leaderId,
|
|
|
|
@JsonProperty("leaderId") Integer leaderId,
|
|
|
|
@JsonProperty("wasLeader") boolean wasLeader,
|
|
|
|
@JsonProperty("wasLeader") boolean wasLeader,
|
|
|
|
@JsonProperty("hasAge") boolean hasAge,
|
|
|
|
@JsonProperty("hasAge") boolean hasAge,
|
|
|
|
@JsonProperty("hasDegree") boolean hasDegree,
|
|
|
|
@JsonProperty("hasDegree") boolean hasDegree,
|
|
|
|
@JsonProperty("paperIds") List<Integer> paperIds,
|
|
|
|
@JsonProperty("paperIds") List<Integer> paperIds,
|
|
|
|
@JsonProperty("papers") List<Paper> papers) {
|
|
|
|
@JsonProperty("papers") List<PaperDto> papers) {
|
|
|
|
this.id = id;
|
|
|
|
this.id = id;
|
|
|
|
this.title = title;
|
|
|
|
this.title = title;
|
|
|
|
this.status = status;
|
|
|
|
this.status = status;
|
|
|
@ -92,7 +92,7 @@ public class GrantDto {
|
|
|
|
this.hasAge = false;
|
|
|
|
this.hasAge = false;
|
|
|
|
this.hasDegree = false;
|
|
|
|
this.hasDegree = false;
|
|
|
|
this.paperIds = convert(grant.getPapers(), paper -> paper.getId());
|
|
|
|
this.paperIds = convert(grant.getPapers(), paper -> paper.getId());
|
|
|
|
this.papers = grant.getPapers();
|
|
|
|
this.papers = convert(grant.getPapers(), PaperDto::new);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
public Integer getId() {
|
|
|
|
public Integer getId() {
|
|
|
@ -214,11 +214,11 @@ public class GrantDto {
|
|
|
|
this.paperIds = paperIds;
|
|
|
|
this.paperIds = paperIds;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
public List<Paper> getPapers() {
|
|
|
|
public List<PaperDto> getPapers() {
|
|
|
|
return papers;
|
|
|
|
return papers;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
public void setPapers(List<Paper> papers) {
|
|
|
|
public void setPapers(List<PaperDto> papers) {
|
|
|
|
this.papers = papers;
|
|
|
|
this.papers = papers;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|