Commit 9447a867 by chenweisong

为基础类添加创建时间属性

parent d2c40b5c
...@@ -63,11 +63,17 @@ public class IndexCtrl { ...@@ -63,11 +63,17 @@ public class IndexCtrl {
} }
@ApiOperation(value = "审核收数") @ApiOperation(value = "审核通过收数")
@PostMapping(value = "/task/adjust") @PostMapping(value = "/task/pass")
public Map adjustTask(@RequestParam int id) { public Map passTask(@RequestParam int id) {
return ImmutableMap.of("code", 200); return ImmutableMap.of("code", 200);
} }
@ApiOperation(value = "审核驳回收数")
@PostMapping(value = "/task/reject")
public Map rejectTask(@RequestParam int id) {
return ImmutableMap.of("code", 200);
}
} }
...@@ -7,6 +7,7 @@ import lombok.NoArgsConstructor; ...@@ -7,6 +7,7 @@ import lombok.NoArgsConstructor;
import javax.persistence.*; import javax.persistence.*;
import java.io.Serializable; import java.io.Serializable;
import java.sql.Timestamp;
/** /**
* spreadJs 配置的报表 * spreadJs 配置的报表
...@@ -22,6 +23,9 @@ public class Excel implements Serializable { ...@@ -22,6 +23,9 @@ public class Excel implements Serializable {
private Long id; private Long id;
@Column(columnDefinition = "DATETIME COMMENT '创建时间'")
private Timestamp createAt;
@ManyToOne @ManyToOne
@JsonIgnore @JsonIgnore
private Task task; private Task task;
......
...@@ -6,6 +6,7 @@ import lombok.NoArgsConstructor; ...@@ -6,6 +6,7 @@ import lombok.NoArgsConstructor;
import javax.persistence.*; import javax.persistence.*;
import java.io.Serializable; import java.io.Serializable;
import java.sql.Timestamp;
/** /**
* spreadJs 填写的数据 * spreadJs 填写的数据
...@@ -21,6 +22,9 @@ public class RecordData implements Serializable { ...@@ -21,6 +22,9 @@ public class RecordData implements Serializable {
private Long id; private Long id;
@Column(columnDefinition = "DATETIME COMMENT '创建时间'")
private Timestamp createAt;
@ManyToOne @ManyToOne
private RecordInfo recordInfo; private RecordInfo recordInfo;
......
...@@ -8,6 +8,7 @@ import lombok.NoArgsConstructor; ...@@ -8,6 +8,7 @@ import lombok.NoArgsConstructor;
import javax.persistence.*; import javax.persistence.*;
import java.io.Serializable; import java.io.Serializable;
import java.sql.Timestamp;
import java.util.List; import java.util.List;
/** /**
...@@ -24,6 +25,9 @@ public class RecordInfo implements Serializable { ...@@ -24,6 +25,9 @@ public class RecordInfo implements Serializable {
private Long id; private Long id;
@Column(columnDefinition = "DATETIME COMMENT '创建时间'")
private Timestamp createAt;
@OneToMany @OneToMany
List<RecordData> recordDataList; List<RecordData> recordDataList;
......
...@@ -5,6 +5,8 @@ import lombok.AllArgsConstructor; ...@@ -5,6 +5,8 @@ import lombok.AllArgsConstructor;
import lombok.Data; import lombok.Data;
import lombok.NoArgsConstructor; import lombok.NoArgsConstructor;
import java.sql.Timestamp;
import javax.persistence.*; import javax.persistence.*;
import java.io.Serializable; import java.io.Serializable;
import java.util.List; import java.util.List;
...@@ -35,6 +37,12 @@ public class Task implements Serializable { ...@@ -35,6 +37,12 @@ public class Task implements Serializable {
@Column(columnDefinition = "int(2) default 1 COMMENT '是否需要审核 1 不需要 2 需要'") @Column(columnDefinition = "int(2) default 1 COMMENT '是否需要审核 1 不需要 2 需要'")
private Integer adjust = 2; private Integer adjust = 2;
@Column(columnDefinition = "DATETIME COMMENT '自动发起时间'")
private Timestamp startAt;
@Column(columnDefinition = "DATETIME COMMENT '创建时间'")
private Timestamp createAt;
@OneToMany @OneToMany
private List<Excel> excelList; private List<Excel> excelList;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment