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
d549c9e0
Commit
d549c9e0
authored
Jan 26, 2021
by
nie'hong
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
测试
parent
9aec99f6
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
7 deletions
+4
-7
WorkTimeOrderServiceImpl.java
...a/cn/wisenergy/service/impl/WorkTimeOrderServiceImpl.java
+3
-6
WorkUserServiceImpl.java
...n/java/cn/wisenergy/service/impl/WorkUserServiceImpl.java
+1
-1
No files found.
wisenergy-service/src/main/java/cn/wisenergy/service/impl/WorkTimeOrderServiceImpl.java
View file @
d549c9e0
...
...
@@ -49,10 +49,7 @@ public class WorkTimeOrderServiceImpl implements WorkTimeOrderService {
private
WorkDeptService
workDeptService
;
@Autowired
private
WorkTimeOrderService
workTimeOrderService
;
@Autowired
private
WorkSubmitAdoptService
workSbumitAdoptService
;
private
WorkSubmitAdoptService
workSubmitAdoptService
;
@Autowired
private
WorkHolidayService
workHolidayService
;
...
...
@@ -528,7 +525,7 @@ public class WorkTimeOrderServiceImpl implements WorkTimeOrderService {
log
.
info
(
"WorkOrderServiceImpl[]checkWorkOrderInfo[]input.method"
);
// 1、工单时间不能大于当前天
Date
date
=
new
Date
();
WorkSubmitAdopt
workSubmitAdopt
=
workS
bu
mitAdoptService
.
getById
(
1
);
WorkSubmitAdopt
workSubmitAdopt
=
workS
ub
mitAdoptService
.
getById
(
1
);
Integer
submitTime
=
workSubmitAdopt
.
getSubmitTime
();
for
(
WorkTimeOrderDto
dto
:
list
)
{
if
(
null
==
dto
.
getDes
())
{
...
...
@@ -589,7 +586,7 @@ public class WorkTimeOrderServiceImpl implements WorkTimeOrderService {
// 驳回重新填报
private
void
reSubmit
(
List
<
WorkTimeOrderDto
>
workTimeOrders
)
{
WorkSubmitAdopt
workSubmitAdopt
=
workS
bu
mitAdoptService
.
getById
(
1
);
WorkSubmitAdopt
workSubmitAdopt
=
workS
ub
mitAdoptService
.
getById
(
1
);
Integer
submitTime
=
workSubmitAdopt
.
getSubmitTime
();
for
(
WorkTimeOrderDto
workTimeOrderDto
:
workTimeOrders
)
{
if
(
null
==
workTimeOrderDto
.
getDes
())
{
...
...
wisenergy-service/src/main/java/cn/wisenergy/service/impl/WorkUserServiceImpl.java
View file @
d549c9e0
...
...
@@ -48,7 +48,7 @@ public class WorkUserServiceImpl implements WorkUserService {
}
WorkUser
workUser
=
workUserMapper
.
selectById
(
id
);
if
(
null
==
workUser
)
{
throw
new
BaseCustomException
(
BASE_RESP_CODE_ENUM
.
DEPT_NOT_HAVE_USER
);
throw
new
BaseCustomException
(
BASE_RESP_CODE_ENUM
.
QUERY_USER_INFO_FAIL
);
}
return
workUser
;
}
...
...
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