romanov73/ng-tracker
1
0
Fork 0
Code Issues 18 Pull Requests 4 Projects Releases Wiki Activity

add deadlineDate to models

Browse Source
This commit is contained in:
Alyona 2018-10-27 22:24:10 +04:00
parent 5e7cff8ac6
commit 43740981f2
2 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/main/java/ru/ulstu/paper/model/Paper.java
View File

@ -37,6 +37,9 @@ public class Paper extends BaseEntity {
@Column(name = "update_date") @Column(name = "update_date")
private Date updateDate; private Date updateDate;
@Column(name = "deadline_date")
private Date deadlineDate;
private String comment; private String comment;
private Boolean locked; private Boolean locked;
@ -72,6 +75,14 @@ public class Paper extends BaseEntity {
this.updateDate = updateDate; this.updateDate = updateDate;
} }
public Date getDeadlineDate() {
return deadlineDate;
}
public void setDeadlineDate(Date deadlineDate) {
this.deadlineDate = deadlineDate;
}
public String getComment() { public String getComment() {
return comment; return comment;
} }

6
src/main/java/ru/ulstu/paper/model/PaperDto.java
View File

@ -15,6 +15,7 @@ public class PaperDto {
private final Paper.PaperStatus status; private final Paper.PaperStatus status;
private final Date createDate; private final Date createDate;
private final Date updateDate; private final Date updateDate;
private final Date deadlineDate;
private final String comment; private final String comment;
private final Boolean locked; private final Boolean locked;
private final String tmpFileName; private final String tmpFileName;
@ -29,6 +30,7 @@ public class PaperDto {
@JsonProperty("status") Paper.PaperStatus status, @JsonProperty("status") Paper.PaperStatus status,
@JsonProperty("createDate") Date createDate, @JsonProperty("createDate") Date createDate,
@JsonProperty("updateDate") Date updateDate, @JsonProperty("updateDate") Date updateDate,
@JsonProperty("deadlineDate") Date deadlineDate,
@JsonProperty("comment") String comment, @JsonProperty("comment") String comment,
@JsonProperty("locked") Boolean locked, @JsonProperty("locked") Boolean locked,
@JsonProperty("tmpFileName") String tmpFileName, @JsonProperty("tmpFileName") String tmpFileName,
@ -38,6 +40,7 @@ public class PaperDto {
this.status = status; this.status = status;
this.createDate = createDate; this.createDate = createDate;
this.updateDate = updateDate; this.updateDate = updateDate;
this.deadlineDate = deadlineDate;
this.comment = comment; this.comment = comment;
this.locked = locked; this.locked = locked;
this.tmpFileName = tmpFileName; this.tmpFileName = tmpFileName;
@ -53,6 +56,7 @@ public class PaperDto {
this.status = paper.getStatus(); this.status = paper.getStatus();
this.createDate = paper.getCreateDate(); this.createDate = paper.getCreateDate();
this.updateDate = paper.getUpdateDate(); this.updateDate = paper.getUpdateDate();
this.deadlineDate = paper.getDeadlineDate();
this.comment = paper.getComment(); this.comment = paper.getComment();
this.locked = paper.getLocked(); this.locked = paper.getLocked();
this.tmpFileName = null; this.tmpFileName = null;
@ -82,6 +86,8 @@ public class PaperDto {
return updateDate; return updateDate;
} }
public Date getDeadlineDate() {return deadlineDate;}
public String getComment() { public String getComment() {
return comment; return comment;
} }