Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
D
datacollector
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
chenweisong
datacollector
Commits
9447a867
Commit
9447a867
authored
Mar 05, 2020
by
chenweisong
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
为基础类添加创建时间属性
parent
d2c40b5c
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
29 additions
and
3 deletions
+29
-3
IndexCtrl.java
src/main/java/com/keymobile/rest/ctrl/IndexCtrl.java
+9
-3
Excel.java
src/main/java/com/keymobile/rest/model/Excel.java
+4
-0
RecordData.java
src/main/java/com/keymobile/rest/model/RecordData.java
+4
-0
RecordInfo.java
src/main/java/com/keymobile/rest/model/RecordInfo.java
+4
-0
Task.java
src/main/java/com/keymobile/rest/model/Task.java
+8
-0
No files found.
src/main/java/com/keymobile/rest/ctrl/IndexCtrl.java
View file @
9447a867
...
@@ -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
adjust
Task
(
@RequestParam
int
id
)
{
public
Map
pass
Task
(
@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
);
}
}
}
src/main/java/com/keymobile/rest/model/Excel.java
View file @
9447a867
...
@@ -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
;
...
...
src/main/java/com/keymobile/rest/model/RecordData.java
View file @
9447a867
...
@@ -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
;
...
...
src/main/java/com/keymobile/rest/model/RecordInfo.java
View file @
9447a867
...
@@ -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
;
...
...
src/main/java/com/keymobile/rest/model/Task.java
View file @
9447a867
...
@@ -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
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment