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
1191b4cb
Commit
1191b4cb
authored
Feb 01, 2021
by
cq990612
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
优化代码结构
parent
66526362
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
3 deletions
+3
-3
WorkTimeOrderServiceImpl.java
...a/cn/wisenergy/service/impl/WorkTimeOrderServiceImpl.java
+3
-3
No files found.
wisenergy-service/src/main/java/cn/wisenergy/service/impl/WorkTimeOrderServiceImpl.java
View file @
1191b4cb
...
@@ -203,7 +203,7 @@ public class WorkTimeOrderServiceImpl implements WorkTimeOrderService {
...
@@ -203,7 +203,7 @@ public class WorkTimeOrderServiceImpl implements WorkTimeOrderService {
List
<
WorkTimeOrderDto
>
workTimeOrders
=
createWorkOrderDto
.
getWorkTimeOrders
();
List
<
WorkTimeOrderDto
>
workTimeOrders
=
createWorkOrderDto
.
getWorkTimeOrders
();
Date
date
=
new
Date
();
Date
date
=
new
Date
();
WorkSubmitAdopt
workSubmitAdopt
=
workSubmitAdoptService
.
getById
(
1
);
WorkSubmitAdopt
workSubmitAdopt
=
workSubmitAdoptService
.
getById
(
1
);
Integer
submitTime
=
workSubmitAdopt
.
getSubmitTim
e
();
Integer
autoExamine
=
workSubmitAdopt
.
getAutoExamin
e
();
// 1.判断是否重复填报
// 1.判断是否重复填报
isRepeat
(
workTimeOrders
);
isRepeat
(
workTimeOrders
);
...
@@ -259,14 +259,14 @@ public class WorkTimeOrderServiceImpl implements WorkTimeOrderService {
...
@@ -259,14 +259,14 @@ public class WorkTimeOrderServiceImpl implements WorkTimeOrderService {
for
(
WorkTimeOrder
dto
:
addList
)
{
for
(
WorkTimeOrder
dto
:
addList
)
{
// 4、默认设置超过系统默认3天(包括驳回3天)未填报的工时将不能填报
// 4、默认设置超过系统默认3天(包括驳回3天)未填报的工时将不能填报
if
(!
REJECTED
.
equals
(
dto
.
getStatus
())
&&
!
RE_SUBMIT
.
equals
(
dto
.
getStatus
()))
{
if
(!
REJECTED
.
equals
(
dto
.
getStatus
())
&&
!
RE_SUBMIT
.
equals
(
dto
.
getStatus
()))
{
if
(
date
.
getTime
()
-
dto
.
getWorkDay
().
getTime
()
>
submitTim
e
*
24
*
60
*
60
*
1000
)
{
if
(
date
.
getTime
()
-
dto
.
getWorkDay
().
getTime
()
>
autoExamin
e
*
24
*
60
*
60
*
1000
)
{
throw
new
BaseCustomException
(
BASE_RESP_CODE_ENUM
.
WORK_DAY_THAN_DATE
);
throw
new
BaseCustomException
(
BASE_RESP_CODE_ENUM
.
WORK_DAY_THAN_DATE
);
}
}
}
}
if
(
REJECTED
.
equals
(
dto
.
getStatus
())
||
RE_SUBMIT
.
equals
(
dto
.
getStatus
()))
{
if
(
REJECTED
.
equals
(
dto
.
getStatus
())
||
RE_SUBMIT
.
equals
(
dto
.
getStatus
()))
{
Date
modifyTime
=
DateUtil
.
convertStrToDate
(
DateUtil
.
convertDateToStr
(
workTimeOrderMapper
.
selectById
(
dto
.
getWorkId
()).
getModifyTime
(),
"yyyy-MM-dd"
),
"yyyy-MM-dd"
);
Date
modifyTime
=
DateUtil
.
convertStrToDate
(
DateUtil
.
convertDateToStr
(
workTimeOrderMapper
.
selectById
(
dto
.
getWorkId
()).
getModifyTime
(),
"yyyy-MM-dd"
),
"yyyy-MM-dd"
);
System
.
out
.
println
(
modifyTime
);
System
.
out
.
println
(
modifyTime
);
if
(
date
.
getTime
()
-
modifyTime
.
getTime
()
>
submitTim
e
*
24
*
60
*
60
*
1000
)
{
if
(
date
.
getTime
()
-
modifyTime
.
getTime
()
>
autoExamin
e
*
24
*
60
*
60
*
1000
)
{
throw
new
BaseCustomException
(
BASE_RESP_CODE_ENUM
.
WORK_DAY_THAN_DATE
);
throw
new
BaseCustomException
(
BASE_RESP_CODE_ENUM
.
WORK_DAY_THAN_DATE
);
}
}
}
}
...
...
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