Skip to content
Toggle navigation
Projects
Groups
Snippets
Help
yangxiujun
/
paidan_demo
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Pipelines
Wiki
Snippets
Settings
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit e5a113c8
authored
Nov 21, 2023
by
刘鑫
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix(ID1004135): 博西PEA_V1.0-改派:改派给未请假、当日没工单的工程师,提示存在日程冲突
1 parent
90328f93
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 additions
and
1 deletions
project-order/src/main/java/com/dituhui/pea/order/service/impl/OrderInfoServiceImpl.java
project-order/src/main/java/com/dituhui/pea/order/service/impl/OrderInfoServiceImpl.java
View file @
e5a113c
...
@@ -483,7 +483,7 @@ public class OrderInfoServiceImpl implements OrderInfoService {
...
@@ -483,7 +483,7 @@ public class OrderInfoServiceImpl implements OrderInfoService {
// 没有单直接返回
// 没有单直接返回
if
(
CollectionUtils
.
isEmpty
(
engineerOrders
))
{
if
(
CollectionUtils
.
isEmpty
(
engineerOrders
))
{
Result
handleLeaveTimeResult
=
handleLeaveTime
(
engineerLeaveTimeSlice
,
insertOrder
.
getExpectTimeBegin
(),
insertOrder
.
getExpectTimeEnd
(),
skillInfo
.
getTakeTime
(),
true
,
insertOrder
);
Result
handleLeaveTimeResult
=
handleLeaveTime
(
engineerLeaveTimeSlice
,
insertOrder
.
getExpectTimeBegin
(),
insertOrder
.
getExpectTimeEnd
(),
skillInfo
.
getTakeTime
(),
true
,
insertOrder
);
if
(!
handleLeaveTimeResult
.
getCode
().
equals
(
ResultEnum
.
SUCCESS
))
{
if
(!
handleLeaveTimeResult
.
getCode
().
equals
(
ResultEnum
.
SUCCESS
.
getCode
()
))
{
return
Result
.
failed
(
insertOrder
);
return
Result
.
failed
(
insertOrder
);
}
}
LocalDateTime
planStartTime
=
(
LocalDateTime
)
handleLeaveTimeResult
.
getResult
();
LocalDateTime
planStartTime
=
(
LocalDateTime
)
handleLeaveTimeResult
.
getResult
();
...
...
Write
Preview
Markdown
is supported
Attach a file
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 post a comment