Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gogirl-miniapp-backend
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
huluobin
gogirl-miniapp-backend
Commits
6973d92a
Commit
6973d92a
authored
Mar 06, 2020
by
huluobin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
update
parent
a3e7652a
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
4 deletions
+7
-4
TakeLeaveEventCmdServiceImpl.java
...cation/store/store/impl/TakeLeaveEventCmdServiceImpl.java
+3
-3
TakeLeaveEvent.java
src/main/java/com/gogirl/domain/store/oa/TakeLeaveEvent.java
+4
-1
No files found.
src/main/java/com/gogirl/application/store/store/impl/TakeLeaveEventCmdServiceImpl.java
View file @
6973d92a
...
@@ -155,7 +155,7 @@ public class TakeLeaveEventCmdServiceImpl implements TakeLeaveEventCmdService {
...
@@ -155,7 +155,7 @@ public class TakeLeaveEventCmdServiceImpl implements TakeLeaveEventCmdService {
public
TakeLeaveEvent
queryTakeLeave
(
Long
id
)
{
public
TakeLeaveEvent
queryTakeLeave
(
Long
id
)
{
TakeLeaveEvent
takeLeaveEvent
=
takeLeaveEventRepository
.
selectById
(
id
);
TakeLeaveEvent
takeLeaveEvent
=
takeLeaveEventRepository
.
selectById
(
id
);
StoreTechnician
storeTechnician
=
storeTechnicianRepository
.
selectById
(
takeLeaveEvent
.
getApplyTechnicianId
());
StoreTechnician
storeTechnician
=
storeTechnicianRepository
.
selectById
(
takeLeaveEvent
.
getApplyTechnicianId
());
takeLeaveEvent
.
setApplyStoreTechnician
(
storeTechnician
);
takeLeaveEvent
.
setApplyStoreTechnician
DTO
(
storeTechnician
);
return
takeLeaveEvent
;
return
takeLeaveEvent
;
}
}
...
@@ -180,14 +180,14 @@ public class TakeLeaveEventCmdServiceImpl implements TakeLeaveEventCmdService {
...
@@ -180,14 +180,14 @@ public class TakeLeaveEventCmdServiceImpl implements TakeLeaveEventCmdService {
if
(
ListUtil
.
isEmpty
(
page
.
getRecords
()))
{
if
(
ListUtil
.
isEmpty
(
page
.
getRecords
()))
{
return
page
;
return
page
;
}
}
List
<
Long
>
ids
=
page
.
getRecords
().
stream
().
map
(
TakeLeaveEvent:
:
get
Id
).
collect
(
Collectors
.
toList
());
List
<
Integer
>
ids
=
page
.
getRecords
().
stream
().
map
(
TakeLeaveEvent:
:
getApplyTechnician
Id
).
collect
(
Collectors
.
toList
());
List
<
StoreTechnician
>
storeTechnicianList
=
storeTechnicianRepository
.
selectBatchIds
(
ids
);
List
<
StoreTechnician
>
storeTechnicianList
=
storeTechnicianRepository
.
selectBatchIds
(
ids
);
Map
<
Integer
,
List
<
StoreTechnician
>>
map
=
storeTechnicianList
.
stream
().
collect
(
Collectors
.
groupingBy
(
StoreTechnician:
:
getId
));
Map
<
Integer
,
List
<
StoreTechnician
>>
map
=
storeTechnicianList
.
stream
().
collect
(
Collectors
.
groupingBy
(
StoreTechnician:
:
getId
));
page
.
getRecords
().
forEach
(
takeLeaveEvent
->
{
page
.
getRecords
().
forEach
(
takeLeaveEvent
->
{
if
(
ListUtil
.
isNotEmpty
(
map
.
get
(
takeLeaveEvent
.
getApplyTechnicianId
())))
{
if
(
ListUtil
.
isNotEmpty
(
map
.
get
(
takeLeaveEvent
.
getApplyTechnicianId
())))
{
StoreTechnician
storeTechnician
=
map
.
get
(
takeLeaveEvent
.
getApplyTechnicianId
()).
stream
().
findAny
().
orElse
(
null
);
StoreTechnician
storeTechnician
=
map
.
get
(
takeLeaveEvent
.
getApplyTechnicianId
()).
stream
().
findAny
().
orElse
(
null
);
takeLeaveEvent
.
setApplyStoreTechnician
(
storeTechnician
);
takeLeaveEvent
.
setApplyStoreTechnician
DTO
(
storeTechnician
);
}
}
});
});
return
page
;
return
page
;
...
...
src/main/java/com/gogirl/domain/store/oa/TakeLeaveEvent.java
View file @
6973d92a
...
@@ -76,6 +76,9 @@ public class TakeLeaveEvent {
...
@@ -76,6 +76,9 @@ public class TakeLeaveEvent {
private
Long
createTime
;
private
Long
createTime
;
@TableField
(
exist
=
false
)
@TableField
(
exist
=
false
)
private
StoreTechnician
applyStoreTechnician
;
private
StoreTechnician
applyStoreTechnicianDTO
;
@TableField
(
exist
=
false
)
private
String
applyTechnicianName
;
}
}
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