Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
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
5b9caf00
Commit
5b9caf00
authored
Mar 06, 2021
by
cq990612
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
优化代码结构
parent
94ba229f
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
0 deletions
+5
-0
ProjectsDto.java
...del/src/main/java/cn/wisenergy/model/dto/ProjectsDto.java
+2
-0
WorkTimeOrderServiceImpl.java
...a/cn/wisenergy/service/impl/WorkTimeOrderServiceImpl.java
+3
-0
No files found.
wisenergy-model/src/main/java/cn/wisenergy/model/dto/ProjectsDto.java
View file @
5b9caf00
...
@@ -18,4 +18,6 @@ public class ProjectsDto {
...
@@ -18,4 +18,6 @@ public class ProjectsDto {
private
List
<
WorkType
>
workTypes
;
private
List
<
WorkType
>
workTypes
;
private
List
<
WorkType
>
workTypeList
;
}
}
wisenergy-service/src/main/java/cn/wisenergy/service/impl/WorkTimeOrderServiceImpl.java
View file @
5b9caf00
...
@@ -544,6 +544,9 @@ public class WorkTimeOrderServiceImpl implements WorkTimeOrderService {
...
@@ -544,6 +544,9 @@ public class WorkTimeOrderServiceImpl implements WorkTimeOrderService {
}
}
ProjectsDto
projectsDto
=
new
ProjectsDto
();
ProjectsDto
projectsDto
=
new
ProjectsDto
();
WorkUser
user
=
workUserService
.
getById
(
userId
);
WorkUser
user
=
workUserService
.
getById
(
userId
);
// 逻辑删后的东西
List
<
WorkType
>
workTypeList
=
workTypeService
.
getByIsDelete
(
1
,
0
);
projectsDto
.
setWorkTypeList
(
workTypeList
);
// 1.获取可填报的类型
// 1.获取可填报的类型
List
<
WorkType
>
workTypes
=
workTypeService
.
getAll
(
1
);
List
<
WorkType
>
workTypes
=
workTypeService
.
getAll
(
1
);
if
(!
CollectionUtils
.
isEmpty
(
workTypes
))
{
if
(!
CollectionUtils
.
isEmpty
(
workTypes
))
{
...
...
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