Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
H
holmes
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
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
QA
holmes
Commits
6716da86
Commit
6716da86
authored
Sep 29, 2021
by
黎博
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
BuildDataDetail新增字段
parent
1c150587
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
1 deletion
+10
-1
BuildDataController.java
...a/cn/qg/holmes/controller/effect/BuildDataController.java
+7
-1
BuildDataDetail.java
...main/java/cn/qg/holmes/entity/effect/BuildDataDetail.java
+3
-0
No files found.
src/main/java/cn/qg/holmes/controller/effect/BuildDataController.java
View file @
6716da86
...
@@ -16,6 +16,7 @@ import java.util.ArrayList;
...
@@ -16,6 +16,7 @@ import java.util.ArrayList;
import
java.util.HashMap
;
import
java.util.HashMap
;
import
java.util.List
;
import
java.util.List
;
import
java.util.Map
;
import
java.util.Map
;
import
java.util.stream.Collectors
;
/**
/**
* 造数据文档controller
* 造数据文档controller
...
@@ -72,7 +73,12 @@ public class BuildDataController {
...
@@ -72,7 +73,12 @@ public class BuildDataController {
queryWrapper
.
eq
(
"module"
,
module
);
queryWrapper
.
eq
(
"module"
,
module
);
}
}
queryWrapper
.
orderByDesc
(
"id"
);
queryWrapper
.
orderByDesc
(
"id"
);
return
JsonResult
.
buildSuccessResult
(
buildDataDetailService
.
list
(
queryWrapper
));
List
<
BuildDataDetail
>
buildDataDetailList
=
new
ArrayList
<>();
Map
<
Integer
,
String
>
moduleMap
=
buildDataService
.
list
().
stream
().
collect
(
Collectors
.
toMap
(
BuildData:
:
getId
,
BuildData:
:
getName
));
for
(
BuildDataDetail
buildDataDetail:
buildDataDetailList
)
{
buildDataDetail
.
setModuleName
(
moduleMap
.
get
(
buildDataDetail
.
getModule
()));
}
return
JsonResult
.
buildSuccessResult
(
buildDataDetailList
);
}
}
/**
/**
...
...
src/main/java/cn/qg/holmes/entity/effect/BuildDataDetail.java
View file @
6716da86
...
@@ -51,4 +51,7 @@ public class BuildDataDetail {
...
@@ -51,4 +51,7 @@ public class BuildDataDetail {
@TableField
(
value
=
"update_time"
)
@TableField
(
value
=
"update_time"
)
@JsonFormat
(
pattern
=
"yyyy-MM-dd HH:mm:ss"
)
@JsonFormat
(
pattern
=
"yyyy-MM-dd HH:mm:ss"
)
private
Date
updateTime
;
private
Date
updateTime
;
@TableField
(
exist
=
false
)
private
String
moduleName
;
}
}
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