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
f3bcbe9d
Commit
f3bcbe9d
authored
Feb 20, 2021
by
cq990612
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
优化代码结构
parent
e712163f
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
15 additions
and
3 deletions
+15
-3
WorkLevel.java
...model/src/main/java/cn/wisenergy/model/app/WorkLevel.java
+3
-0
ProjectsDto.java
...del/src/main/java/cn/wisenergy/model/dto/ProjectsDto.java
+3
-0
WorkTimeOrderDto.java
...rc/main/java/cn/wisenergy/model/dto/WorkTimeOrderDto.java
+1
-0
LevelEnum.java
...del/src/main/java/cn/wisenergy/model/enums/LevelEnum.java
+1
-1
WorkTimeOrderServiceImpl.java
...a/cn/wisenergy/service/impl/WorkTimeOrderServiceImpl.java
+7
-2
No files found.
wisenergy-model/src/main/java/cn/wisenergy/model/app/WorkLevel.java
View file @
f3bcbe9d
...
...
@@ -25,8 +25,11 @@ public class WorkLevel {
private
Integer
rank
;
@ApiModelProperty
(
name
=
"icon"
,
value
=
"图标"
)
private
String
icon
;
/**附加字段*/
@TableField
(
exist
=
false
)
private
String
path
;
}
wisenergy-model/src/main/java/cn/wisenergy/model/dto/ProjectsDto.java
View file @
f3bcbe9d
package
cn
.
wisenergy
.
model
.
dto
;
import
cn.wisenergy.model.app.WorkType
;
import
lombok.Data
;
import
java.util.List
;
...
...
@@ -15,4 +16,6 @@ public class ProjectsDto {
private
List
<
ProjectManagerDto
>
projectManagerDto
;
private
List
<
WorkType
>
workTypes
;
}
wisenergy-model/src/main/java/cn/wisenergy/model/dto/WorkTimeOrderDto.java
View file @
f3bcbe9d
...
...
@@ -61,6 +61,7 @@ public class WorkTimeOrderDto {
@ApiModelProperty
(
name
=
"isOvertime"
,
value
=
"0:正常工时,1:加班"
)
private
Integer
isOvertime
;
@JsonFormat
(
shape
=
JsonFormat
.
Shape
.
STRING
,
pattern
=
"yyyy-MM-dd"
)
@ApiModelProperty
(
name
=
"rejectTime"
,
value
=
"驳回时间"
)
private
Date
rejectTime
;
...
...
wisenergy-model/src/main/java/cn/wisenergy/model/enums/LevelEnum.java
View file @
f3bcbe9d
...
...
@@ -5,7 +5,7 @@ package cn.wisenergy.model.enums;
* @QQ1799796883
*/
public
enum
LevelEnum
{
EXAMINE
(
"审批"
,
"/index"
),
EXAMINE
(
"
工时
审批"
,
"/index"
),
STATISTICS
(
"统计"
,
"/statistical"
),
PROJECT_MANAGER
(
"项目/商机管理"
,
"/projects"
),
TIMEEXPORT
(
"工时导出"
,
"/export"
),
...
...
wisenergy-service/src/main/java/cn/wisenergy/service/impl/WorkTimeOrderServiceImpl.java
View file @
f3bcbe9d
...
...
@@ -535,9 +535,14 @@ public class WorkTimeOrderServiceImpl implements WorkTimeOrderService {
}
ProjectsDto
projectsDto
=
new
ProjectsDto
();
WorkUser
user
=
workUserService
.
getById
(
userId
);
// 1.获取可填报的项目
// 1.获取可填报的类型
List
<
WorkType
>
workTypes
=
workTypeService
.
getAll
();
if
(!
CollectionUtils
.
isEmpty
(
workTypes
))
{
projectsDto
.
setWorkTypes
(
workTypes
);
}
// 2.获取可填报的项目
projectsDto
.
setProjectInfoDto
(
getProjectInfoDto
(
userId
));
//
2
.获取可审批的项目
//
3
.获取可审批的项目
List
<
UserRoleLevelDto
>
roleUserLevel
=
UserRoleLevelUtils
.
getRoleUserLevel
(
userId
);
if
(
CollectionUtils
.
isEmpty
(
roleUserLevel
))
{
return
projectsDto
;
...
...
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