Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vehicle-quality-review
Project
Project
Details
Activity
Releases
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
王飞
vehicle-quality-review
Commits
6d9c7223
Commit
6d9c7223
authored
Mar 12, 2024
by
wdy
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
时间显示格式&按时间排序
parent
01489bdc
Changes
13
Hide whitespace changes
Inline
Side-by-side
Showing
13 changed files
with
35 additions
and
0 deletions
+35
-0
CarReviewTask.java
...-review/src/main/java/com/ruoyi/domain/CarReviewTask.java
+3
-0
ReviewDetailsResult.java
...w/src/main/java/com/ruoyi/domain/ReviewDetailsResult.java
+1
-0
ReviewEnterpriseArchive.java
...c/main/java/com/ruoyi/domain/ReviewEnterpriseArchive.java
+2
-0
ReviewSceneChangeTask.java
...src/main/java/com/ruoyi/domain/ReviewSceneChangeTask.java
+2
-0
ReviewSceneChangeTaskUserRelation.java
...a/com/ruoyi/domain/ReviewSceneChangeTaskUserRelation.java
+1
-0
Standard.java
quality-review/src/main/java/com/ruoyi/domain/Standard.java
+2
-0
SystemReviewTask.java
...view/src/main/java/com/ruoyi/domain/SystemReviewTask.java
+3
-0
Task.java
quality-review/src/main/java/com/ruoyi/domain/Task.java
+4
-0
TaskListRequest.java
.../src/main/java/com/ruoyi/web/request/TaskListRequest.java
+2
-0
ReviewSceneChangeTaskResponse.java
...com/ruoyi/web/response/ReviewSceneChangeTaskResponse.java
+3
-0
TaskFindResponse.java
...rc/main/java/com/ruoyi/web/response/TaskFindResponse.java
+7
-0
TaskGetInfoResponse.java
...main/java/com/ruoyi/web/response/TaskGetInfoResponse.java
+3
-0
TaskMapper.xml
quality-review/src/main/resources/mapper/TaskMapper.xml
+2
-0
No files found.
quality-review/src/main/java/com/ruoyi/domain/CarReviewTask.java
View file @
6d9c7223
...
@@ -78,12 +78,14 @@ public class CarReviewTask implements Serializable {
...
@@ -78,12 +78,14 @@ public class CarReviewTask implements Serializable {
* 任务开始时间
* 任务开始时间
*/
*/
@ApiModelProperty
(
"任务开始时间"
)
@ApiModelProperty
(
"任务开始时间"
)
@JsonFormat
(
pattern
=
"yyyy-MM-dd HH:mm"
)
private
Date
taskBeginTime
;
private
Date
taskBeginTime
;
/**
/**
* 任务结束时间
* 任务结束时间
*/
*/
@ApiModelProperty
(
"任务结束时间"
)
@ApiModelProperty
(
"任务结束时间"
)
@JsonFormat
(
pattern
=
"yyyy-MM-dd HH:mm"
)
private
Date
taskEndTime
;
private
Date
taskEndTime
;
/**
/**
...
@@ -97,6 +99,7 @@ public class CarReviewTask implements Serializable {
...
@@ -97,6 +99,7 @@ public class CarReviewTask implements Serializable {
* 创建时间
* 创建时间
*/
*/
@ApiModelProperty
(
"创建时间"
)
@ApiModelProperty
(
"创建时间"
)
@JsonFormat
(
pattern
=
"yyyy-MM-dd HH:mm"
)
private
Date
createTime
;
private
Date
createTime
;
/**
/**
...
...
quality-review/src/main/java/com/ruoyi/domain/ReviewDetailsResult.java
View file @
6d9c7223
...
@@ -77,6 +77,7 @@ public class ReviewDetailsResult implements Serializable {
...
@@ -77,6 +77,7 @@ public class ReviewDetailsResult implements Serializable {
* 最后修改时间
* 最后修改时间
*/
*/
@ApiModelProperty
(
"最后修改时间"
)
@ApiModelProperty
(
"最后修改时间"
)
@JsonFormat
(
pattern
=
"yyyy-MM-dd HH:mm"
)
private
Date
lastModifyTime
;
private
Date
lastModifyTime
;
@ApiModelProperty
(
"文件目录"
)
@ApiModelProperty
(
"文件目录"
)
...
...
quality-review/src/main/java/com/ruoyi/domain/ReviewEnterpriseArchive.java
View file @
6d9c7223
...
@@ -46,6 +46,7 @@ public class ReviewEnterpriseArchive implements Serializable {
...
@@ -46,6 +46,7 @@ public class ReviewEnterpriseArchive implements Serializable {
* 发布日期
* 发布日期
*/
*/
@ApiModelProperty
(
"发布日期"
)
@ApiModelProperty
(
"发布日期"
)
@JsonFormat
(
pattern
=
"yyyy-MM-dd HH:mm"
)
private
Date
publishDate
;
private
Date
publishDate
;
/**
/**
...
@@ -83,6 +84,7 @@ public class ReviewEnterpriseArchive implements Serializable {
...
@@ -83,6 +84,7 @@ public class ReviewEnterpriseArchive implements Serializable {
private
String
createBy
;
private
String
createBy
;
@ApiModelProperty
(
"创建时间"
)
@ApiModelProperty
(
"创建时间"
)
@JsonFormat
(
pattern
=
"yyyy-MM-dd HH:mm"
)
private
Date
createTime
;
private
Date
createTime
;
}
}
\ No newline at end of file
quality-review/src/main/java/com/ruoyi/domain/ReviewSceneChangeTask.java
View file @
6d9c7223
...
@@ -190,12 +190,14 @@ public class ReviewSceneChangeTask {
...
@@ -190,12 +190,14 @@ public class ReviewSceneChangeTask {
* 任务开始时间
* 任务开始时间
*/
*/
@ApiModelProperty
(
"任务开始时间"
)
@ApiModelProperty
(
"任务开始时间"
)
@JsonFormat
(
pattern
=
"yyyy-MM-dd HH:mm"
)
private
Date
taskBeginTime
;
private
Date
taskBeginTime
;
/**
/**
* 任务结束时间
* 任务结束时间
*/
*/
@ApiModelProperty
(
"任务结束时间"
)
@ApiModelProperty
(
"任务结束时间"
)
@JsonFormat
(
pattern
=
"yyyy-MM-dd HH:mm"
)
private
Date
taskEndTime
;
private
Date
taskEndTime
;
/**
/**
...
...
quality-review/src/main/java/com/ruoyi/domain/ReviewSceneChangeTaskUserRelation.java
View file @
6d9c7223
...
@@ -65,6 +65,7 @@ public class ReviewSceneChangeTaskUserRelation {
...
@@ -65,6 +65,7 @@ public class ReviewSceneChangeTaskUserRelation {
* 审核时间
* 审核时间
*/
*/
@ApiModelProperty
(
"审核时间"
)
@ApiModelProperty
(
"审核时间"
)
@JsonFormat
(
pattern
=
"yyyy-MM-dd HH:mm"
)
private
Date
decisionTime
;
private
Date
decisionTime
;
/**
/**
...
...
quality-review/src/main/java/com/ruoyi/domain/Standard.java
View file @
6d9c7223
...
@@ -54,9 +54,11 @@ public class Standard {
...
@@ -54,9 +54,11 @@ public class Standard {
private
String
standardStatus
;
private
String
standardStatus
;
@ApiModelProperty
(
"发布日期"
)
@ApiModelProperty
(
"发布日期"
)
@JsonFormat
(
pattern
=
"yyyy-MM-dd HH:mm"
)
private
Date
releaseDate
;
private
Date
releaseDate
;
@ApiModelProperty
(
"实施日期"
)
@ApiModelProperty
(
"实施日期"
)
@JsonFormat
(
pattern
=
"yyyy-MM-dd HH:mm"
)
private
Date
implementationDate
;
private
Date
implementationDate
;
}
}
quality-review/src/main/java/com/ruoyi/domain/SystemReviewTask.java
View file @
6d9c7223
...
@@ -82,12 +82,14 @@ public class SystemReviewTask {
...
@@ -82,12 +82,14 @@ public class SystemReviewTask {
* 任务开始时间
* 任务开始时间
*/
*/
@ApiModelProperty
(
"任务开始时间"
)
@ApiModelProperty
(
"任务开始时间"
)
@JsonFormat
(
pattern
=
"yyyy-MM-dd HH:mm"
)
private
Date
taskBeginTime
;
private
Date
taskBeginTime
;
/**
/**
* 任务结束时间
* 任务结束时间
*/
*/
@ApiModelProperty
(
"任务结束时间"
)
@ApiModelProperty
(
"任务结束时间"
)
@JsonFormat
(
pattern
=
"yyyy-MM-dd HH:mm"
)
private
Date
taskEndTime
;
private
Date
taskEndTime
;
/**
/**
...
@@ -114,6 +116,7 @@ public class SystemReviewTask {
...
@@ -114,6 +116,7 @@ public class SystemReviewTask {
* 创建时间
* 创建时间
*/
*/
@ApiModelProperty
(
"创建时间"
)
@ApiModelProperty
(
"创建时间"
)
@JsonFormat
(
pattern
=
"yyyy-MM-dd HH:mm"
)
private
Date
createTime
;
private
Date
createTime
;
/**
/**
...
...
quality-review/src/main/java/com/ruoyi/domain/Task.java
View file @
6d9c7223
...
@@ -7,6 +7,7 @@ import io.swagger.annotations.ApiModel;
...
@@ -7,6 +7,7 @@ import io.swagger.annotations.ApiModel;
import
io.swagger.annotations.ApiModelProperty
;
import
io.swagger.annotations.ApiModelProperty
;
import
lombok.Data
;
import
lombok.Data
;
import
lombok.experimental.Accessors
;
import
lombok.experimental.Accessors
;
import
org.springframework.format.annotation.DateTimeFormat
;
import
java.util.Date
;
import
java.util.Date
;
import
java.util.List
;
import
java.util.List
;
...
@@ -116,9 +117,11 @@ public class Task {
...
@@ -116,9 +117,11 @@ public class Task {
private
String
taskInitiatorDept
;
private
String
taskInitiatorDept
;
@ApiModelProperty
(
"任务开始时间"
)
@ApiModelProperty
(
"任务开始时间"
)
@JsonFormat
(
pattern
=
"yyyy-MM-dd HH:mm"
)
private
Date
taskBeginTime
;
private
Date
taskBeginTime
;
@ApiModelProperty
(
"任务结束时间"
)
@ApiModelProperty
(
"任务结束时间"
)
@JsonFormat
(
pattern
=
"yyyy-MM-dd HH:mm"
)
private
Date
taskEndTime
;
private
Date
taskEndTime
;
...
@@ -132,6 +135,7 @@ public class Task {
...
@@ -132,6 +135,7 @@ public class Task {
@ApiModelProperty
(
"创建时间"
)
@ApiModelProperty
(
"创建时间"
)
@JsonFormat
(
pattern
=
"yyyy-MM-dd HH:mm"
)
private
Date
createTime
;
private
Date
createTime
;
...
...
quality-review/src/main/java/com/ruoyi/web/request/TaskListRequest.java
View file @
6d9c7223
package
com
.
ruoyi
.
web
.
request
;
package
com
.
ruoyi
.
web
.
request
;
import
com.fasterxml.jackson.annotation.JsonFormat
;
import
com.ruoyi.common.core.page.PageDomain
;
import
com.ruoyi.common.core.page.PageDomain
;
import
io.swagger.annotations.ApiModel
;
import
io.swagger.annotations.ApiModel
;
import
io.swagger.annotations.ApiModelProperty
;
import
io.swagger.annotations.ApiModelProperty
;
...
@@ -12,6 +13,7 @@ import java.util.Date;
...
@@ -12,6 +13,7 @@ import java.util.Date;
public
class
TaskListRequest
extends
PageDomain
{
public
class
TaskListRequest
extends
PageDomain
{
@ApiModelProperty
(
"任务开始时间"
)
@ApiModelProperty
(
"任务开始时间"
)
@JsonFormat
(
pattern
=
"yyyy-MM-dd HH:mm"
)
private
Date
taskBeginTime
;
private
Date
taskBeginTime
;
@ApiModelProperty
(
"任务状态"
)
@ApiModelProperty
(
"任务状态"
)
...
...
quality-review/src/main/java/com/ruoyi/web/response/ReviewSceneChangeTaskResponse.java
View file @
6d9c7223
package
com
.
ruoyi
.
web
.
response
;
package
com
.
ruoyi
.
web
.
response
;
import
com.fasterxml.jackson.annotation.JsonFormat
;
import
io.swagger.annotations.ApiModel
;
import
io.swagger.annotations.ApiModel
;
import
io.swagger.annotations.ApiModelProperty
;
import
io.swagger.annotations.ApiModelProperty
;
import
lombok.Data
;
import
lombok.Data
;
...
@@ -131,12 +132,14 @@ public class ReviewSceneChangeTaskResponse {
...
@@ -131,12 +132,14 @@ public class ReviewSceneChangeTaskResponse {
* 任务开始时间
* 任务开始时间
*/
*/
@ApiModelProperty
(
"任务开始时间"
)
@ApiModelProperty
(
"任务开始时间"
)
@JsonFormat
(
pattern
=
"yyyy-MM-dd HH:mm"
)
private
Date
taskBeginTime
;
private
Date
taskBeginTime
;
/**
/**
* 任务结束时间
* 任务结束时间
*/
*/
@ApiModelProperty
(
"任务结束时间"
)
@ApiModelProperty
(
"任务结束时间"
)
@JsonFormat
(
pattern
=
"yyyy-MM-dd HH:mm"
)
private
Date
taskEndTime
;
private
Date
taskEndTime
;
/**
/**
...
...
quality-review/src/main/java/com/ruoyi/web/response/TaskFindResponse.java
View file @
6d9c7223
...
@@ -4,6 +4,7 @@ import com.fasterxml.jackson.annotation.JsonFormat;
...
@@ -4,6 +4,7 @@ import com.fasterxml.jackson.annotation.JsonFormat;
import
io.swagger.annotations.ApiModel
;
import
io.swagger.annotations.ApiModel
;
import
io.swagger.annotations.ApiModelProperty
;
import
io.swagger.annotations.ApiModelProperty
;
import
lombok.Data
;
import
lombok.Data
;
import
org.springframework.format.annotation.DateTimeFormat
;
import
java.util.Date
;
import
java.util.Date
;
...
@@ -46,9 +47,11 @@ public class TaskFindResponse {
...
@@ -46,9 +47,11 @@ public class TaskFindResponse {
private
String
runStatus
;
private
String
runStatus
;
@ApiModelProperty
(
"总任务开始时间"
)
@ApiModelProperty
(
"总任务开始时间"
)
@JsonFormat
(
pattern
=
"yyyy-MM-dd HH:mm"
)
private
Date
taskBeginTime
;
private
Date
taskBeginTime
;
@ApiModelProperty
(
"任务结束时间"
)
@ApiModelProperty
(
"任务结束时间"
)
@JsonFormat
(
pattern
=
"yyyy-MM-dd HH:mm"
)
private
Date
taskEndTime
;
private
Date
taskEndTime
;
@JsonFormat
(
shape
=
JsonFormat
.
Shape
.
STRING
)
@JsonFormat
(
shape
=
JsonFormat
.
Shape
.
STRING
)
...
@@ -65,9 +68,11 @@ public class TaskFindResponse {
...
@@ -65,9 +68,11 @@ public class TaskFindResponse {
private
Double
systemReview
;
private
Double
systemReview
;
@ApiModelProperty
(
"体系问卷任务开始时间"
)
@ApiModelProperty
(
"体系问卷任务开始时间"
)
@JsonFormat
(
pattern
=
"yyyy-MM-dd HH:mm"
)
private
Date
systemTaskBeginTime
;
private
Date
systemTaskBeginTime
;
@ApiModelProperty
(
"体系问卷任务结束时间"
)
@ApiModelProperty
(
"体系问卷任务结束时间"
)
@JsonFormat
(
pattern
=
"yyyy-MM-dd HH:mm"
)
private
Date
systemTaskEndTime
;
private
Date
systemTaskEndTime
;
@ApiModelProperty
(
"车型审查任务状态"
)
@ApiModelProperty
(
"车型审查任务状态"
)
...
@@ -77,9 +82,11 @@ public class TaskFindResponse {
...
@@ -77,9 +82,11 @@ public class TaskFindResponse {
private
Double
carReview
;
private
Double
carReview
;
@ApiModelProperty
(
"车辆问卷任务开始时间"
)
@ApiModelProperty
(
"车辆问卷任务开始时间"
)
@JsonFormat
(
pattern
=
"yyyy-MM-dd HH:mm"
)
private
Date
carTaskBeginTime
;
private
Date
carTaskBeginTime
;
@ApiModelProperty
(
"车辆问卷任务结束时间"
)
@ApiModelProperty
(
"车辆问卷任务结束时间"
)
@JsonFormat
(
pattern
=
"yyyy-MM-dd HH:mm"
)
private
Date
carTaskEndTime
;
private
Date
carTaskEndTime
;
@ApiModelProperty
(
"测试任务状态"
)
@ApiModelProperty
(
"测试任务状态"
)
...
...
quality-review/src/main/java/com/ruoyi/web/response/TaskGetInfoResponse.java
View file @
6d9c7223
...
@@ -78,9 +78,11 @@ public class TaskGetInfoResponse {
...
@@ -78,9 +78,11 @@ public class TaskGetInfoResponse {
private
String
taskInitiatorDept
;
private
String
taskInitiatorDept
;
@ApiModelProperty
(
"任务开始时间"
)
@ApiModelProperty
(
"任务开始时间"
)
@JsonFormat
(
pattern
=
"yyyy-MM-dd HH:mm"
)
private
Date
taskBeginTime
;
private
Date
taskBeginTime
;
@ApiModelProperty
(
"任务结束时间"
)
@ApiModelProperty
(
"任务结束时间"
)
@JsonFormat
(
pattern
=
"yyyy-MM-dd HH:mm"
)
private
Date
taskEndTime
;
private
Date
taskEndTime
;
...
@@ -94,6 +96,7 @@ public class TaskGetInfoResponse {
...
@@ -94,6 +96,7 @@ public class TaskGetInfoResponse {
@ApiModelProperty
(
"创建时间"
)
@ApiModelProperty
(
"创建时间"
)
@JsonFormat
(
pattern
=
"yyyy-MM-dd HH:mm"
)
private
Date
createTime
;
private
Date
createTime
;
...
...
quality-review/src/main/resources/mapper/TaskMapper.xml
View file @
6d9c7223
...
@@ -156,6 +156,7 @@
...
@@ -156,6 +156,7 @@
)
)
</if>
</if>
</where>
</where>
order by t.task_begin_time desc
</select>
</select>
<select
id=
"findByCarReviewTaskId"
resultType=
"java.lang.Long"
>
<select
id=
"findByCarReviewTaskId"
resultType=
"java.lang.Long"
>
SELECT id
SELECT id
...
@@ -246,6 +247,7 @@
...
@@ -246,6 +247,7 @@
)
)
</if>
</if>
</where>
</where>
order by t.task_begin_time desc
</select>
</select>
<select
id=
"getByUserIdTemporary"
resultType=
"com.ruoyi.domain.Task"
>
<select
id=
"getByUserIdTemporary"
resultType=
"com.ruoyi.domain.Task"
>
SELECT id, system_review_task_id, car_review_task_id,
SELECT id, system_review_task_id, car_review_task_id,
...
...
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