Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gic-platform-enterprise
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
base_platform_enterprise
gic-platform-enterprise
Commits
0d2febf1
Commit
0d2febf1
authored
Apr 28, 2020
by
zhiwj
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改bug
parent
f56f2939
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
12 additions
and
12 deletions
+12
-12
TodoItemDTO.java
...api/src/main/java/com/gic/enterprise/dto/TodoItemDTO.java
+10
-0
TabTodoItem.java
.../src/main/java/com/gic/enterprise/entity/TabTodoItem.java
+0
-10
TodoItemApiServiceImpl.java
...enterprise/service/outer/impl/TodoItemApiServiceImpl.java
+2
-2
No files found.
gic-platform-enterprise-api/src/main/java/com/gic/enterprise/dto/TodoItemDTO.java
View file @
0d2febf1
...
...
@@ -77,6 +77,16 @@ public class TodoItemDTO implements Serializable {
@NotBlank
(
message
=
"url不能为空"
,
groups
=
SaveValidView
.
class
)
private
String
itemInfoUrl
;
private
String
itemTypeName
;
public
void
setItemTypeName
(
String
itemTypeName
)
{
this
.
itemTypeName
=
itemTypeName
;
}
public
String
getItemTypeName
()
{
return
itemTypeName
;
}
public
Integer
getTodoItemId
()
{
return
todoItemId
;
}
...
...
gic-platform-enterprise-service/src/main/java/com/gic/enterprise/entity/TabTodoItem.java
View file @
0d2febf1
...
...
@@ -60,7 +60,6 @@ public class TabTodoItem {
* 存事项的需要反查的内容,url
*/
private
String
itemInfoUrl
;
private
String
itemTypeName
;
public
Integer
getTodoItemId
()
{
return
todoItemId
;
...
...
@@ -149,12 +148,4 @@ public class TabTodoItem {
public
void
setItemInfoUrl
(
String
itemInfoUrl
)
{
this
.
itemInfoUrl
=
itemInfoUrl
;
}
public
void
setItemTypeName
(
String
itemTypeName
)
{
this
.
itemTypeName
=
itemTypeName
;
}
public
String
getItemTypeName
()
{
return
itemTypeName
;
}
}
\ No newline at end of file
gic-platform-enterprise-service/src/main/java/com/gic/enterprise/service/outer/impl/TodoItemApiServiceImpl.java
View file @
0d2febf1
...
...
@@ -63,14 +63,14 @@ public class TodoItemApiServiceImpl implements TodoItemApiService {
@Override
public
ServiceResponse
<
Page
<
TodoItemDTO
>>
listTodoItem
(
TodoItemQO
todoItemQO
)
{
com
.
github
.
pagehelper
.
Page
<
TabTodoItem
>
page
=
this
.
todoItemService
.
listTodoItem
(
todoItemQO
);
Page
<
TodoItemDTO
>
result
=
PageHelperUtils
.
changePageHelperToCurrentPage
(
page
,
TodoItemDTO
.
class
);
if
(
CollectionUtils
.
isNotEmpty
(
page
))
{
List
<
DictDTO
>
list
=
dictApiService
.
listTodoItemType
().
getResult
();
Map
<
String
,
String
>
map
=
list
.
stream
().
collect
(
Collectors
.
toMap
(
DictDTO:
:
getValue
,
DictDTO:
:
getKey
));
for
(
T
abTodoItem
e
:
page
)
{
for
(
T
odoItemDTO
e
:
result
.
getResult
()
)
{
e
.
setItemTypeName
(
map
.
get
(
e
.
getItemType
()));
}
}
Page
<
TodoItemDTO
>
result
=
PageHelperUtils
.
changePageHelperToCurrentPage
(
page
,
TodoItemDTO
.
class
);
return
EnterpriseServiceResponse
.
success
(
result
);
}
...
...
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