Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
W
work_service
Project
Project
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
licc
work_service
Commits
1e74a94a
Commit
1e74a94a
authored
Mar 17, 2021
by
cq990612
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
优化代码结构
parent
3f0f3c1f
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
23 additions
and
21 deletions
+23
-21
WorkTimeOrderServiceImpl.java
...a/cn/wisenergy/service/impl/WorkTimeOrderServiceImpl.java
+23
-21
No files found.
wisenergy-service/src/main/java/cn/wisenergy/service/impl/WorkTimeOrderServiceImpl.java
View file @
1e74a94a
...
@@ -996,12 +996,14 @@ public class WorkTimeOrderServiceImpl implements WorkTimeOrderService {
...
@@ -996,12 +996,14 @@ public class WorkTimeOrderServiceImpl implements WorkTimeOrderService {
if
(
LevelRankEnum
.
DEPARTMENT_LEVEL
.
getRank
().
equals
(
rankMax
))
{
if
(
LevelRankEnum
.
DEPARTMENT_LEVEL
.
getRank
().
equals
(
rankMax
))
{
deptIds
.
add
(
user
.
getDeptId
());
deptIds
.
add
(
user
.
getDeptId
());
deptNotOrderInfo
=
workTimeOrderMapper
.
getDeptNotOrderInfo
(
userId
,
deptIds
,
startDate
,
endDate
);
deptNotOrderInfo
=
workTimeOrderMapper
.
getDeptNotOrderInfo
(
userId
,
deptIds
,
startDate
,
endDate
);
if
(!
CollectionUtils
.
isEmpty
(
deptNotOrderInfo
))
{
DeptUserDto
deptUserDto
=
new
DeptUserDto
();
DeptUserDto
deptUserDto
=
new
DeptUserDto
();
deptUserDto
.
setDeptId
(
deptNotOrderInfo
.
get
(
0
).
getDeptId
());
deptUserDto
.
setDeptId
(
deptNotOrderInfo
.
get
(
0
).
getDeptId
());
deptUserDto
.
setDeptName
(
deptNotOrderInfo
.
get
(
0
).
getDeptName
());
deptUserDto
.
setDeptName
(
deptNotOrderInfo
.
get
(
0
).
getDeptName
());
deptUserDtos
.
add
(
deptUserDto
);
deptUserDtos
.
add
(
deptUserDto
);
}
}
}
if
(!
CollectionUtils
.
isEmpty
(
deptUserDtos
)
&&
!
CollectionUtils
.
isEmpty
(
deptNotOrderInfo
))
{
for
(
DeptUserDto
deptUserDto
:
deptUserDtos
)
{
for
(
DeptUserDto
deptUserDto
:
deptUserDtos
)
{
List
<
UserDto
>
userDtos
=
new
ArrayList
<>();
List
<
UserDto
>
userDtos
=
new
ArrayList
<>();
for
(
DeptUserCollectDto
deptUserCollectDto
:
deptNotOrderInfo
)
{
for
(
DeptUserCollectDto
deptUserCollectDto
:
deptNotOrderInfo
)
{
...
@@ -1020,7 +1022,7 @@ public class WorkTimeOrderServiceImpl implements WorkTimeOrderService {
...
@@ -1020,7 +1022,7 @@ public class WorkTimeOrderServiceImpl implements WorkTimeOrderService {
}
}
deptUserDto
.
setUserDtos
(
userDtos
);
deptUserDto
.
setUserDtos
(
userDtos
);
}
}
}
notWorkSubmitOrderDto
.
setDeptUserDtos
(
deptUserDtos
);
notWorkSubmitOrderDto
.
setDeptUserDtos
(
deptUserDtos
);
return
notWorkSubmitOrderDto
;
return
notWorkSubmitOrderDto
;
}
}
...
...
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