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
4d598174
Commit
4d598174
authored
4 years ago
by
cq990612
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
优化代码结构
parent
c3d32cb9
master
chenqi
chenqi2.0
chenqi3.0
chenqi4.0
chenqi5.0
No related merge requests found
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
2 deletions
+2
-2
WorkTimeOrderServiceImpl.java
...a/cn/wisenergy/service/impl/WorkTimeOrderServiceImpl.java
+2
-2
No files found.
wisenergy-service/src/main/java/cn/wisenergy/service/impl/WorkTimeOrderServiceImpl.java
View file @
4d598174
...
...
@@ -264,13 +264,13 @@ public class WorkTimeOrderServiceImpl implements WorkTimeOrderService {
dto
.
setStatus
(
RE_SUBMIT
);
Date
rejectTime
=
DateUtil
.
convertStrToDate
(
DateUtil
.
convertDateToStr
(
rejectTime1
,
"yyyy-MM-dd"
),
"yyyy-MM-dd"
);
if
(
date
.
getTime
()
-
rejectTime
.
getTime
()
>
submitTime
*
24
*
60
*
60
*
1000
)
{
throw
new
BaseCustomException
(
BASE_RESP_CODE_ENUM
.
WORK_DAY_THAN_DATE
);
throw
new
BaseCustomException
(
"627"
,
"超过"
+
submitTime
+
"天的工单不能补报"
);
}
}
// 4、默认设置超过系统默认3天(包括驳回3天)未填报的工时将不能填报
if
(!
REJECTED
.
equals
(
dto
.
getStatus
())
&&
!
RE_SUBMIT
.
equals
(
dto
.
getStatus
()))
{
if
(
date
.
getTime
()
-
dto
.
getWorkDay
().
getTime
()
>
submitTime
*
24
*
60
*
60
*
1000
)
{
throw
new
BaseCustomException
(
BASE_RESP_CODE_ENUM
.
WORK_DAY_THAN_DATE
);
throw
new
BaseCustomException
(
"627"
,
"超过"
+
submitTime
+
"天的工单不能补报"
);
}
}
...
...
This diff is collapsed.
Click to expand it.
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