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
b4a91035
Commit
b4a91035
authored
Jan 26, 2021
by
cq990612
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
优化代码结构
parent
9af51e99
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
1 deletion
+5
-1
WorkTimeOrderDto.java
...rc/main/java/cn/wisenergy/model/dto/WorkTimeOrderDto.java
+4
-0
WorkTimeOrderServiceImpl.java
...a/cn/wisenergy/service/impl/WorkTimeOrderServiceImpl.java
+1
-1
No files found.
wisenergy-model/src/main/java/cn/wisenergy/model/dto/WorkTimeOrderDto.java
View file @
b4a91035
...
...
@@ -58,4 +58,8 @@ public class WorkTimeOrderDto {
@ApiModelProperty
(
name
=
"typeName"
,
value
=
"项目类型名"
)
private
String
typeName
;
@ApiModelProperty
(
name
=
"isOvertime"
,
value
=
"0:正常工时,1:加班"
)
private
Integer
isOvertime
;
}
wisenergy-service/src/main/java/cn/wisenergy/service/impl/WorkTimeOrderServiceImpl.java
View file @
b4a91035
...
...
@@ -573,7 +573,7 @@ public class WorkTimeOrderServiceImpl implements WorkTimeOrderService {
throw
new
BaseCustomException
(
BASE_RESP_CODE_ENUM
.
WORK_TIME_OVER_NOW_DAY
);
}
if
(
0
==
dto
.
getWorkTime
())
{
if
(
0
==
dto
.
getWorkTime
()
||
null
==
dto
.
getWorkTime
()
)
{
throw
new
BaseCustomException
(
BASE_RESP_CODE_ENUM
.
TIME_NOT_IS_NULL
);
}
// 2、默认设置超过系统默认3天(包括驳回3天)未填报的工时将不能填报
...
...
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