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 d0a16b09
authored
Oct 31, 2023
by
刘鑫
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
doc(ID1003910): 提示信息修订
1 parent
e0185240
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
2 deletions
project-order/src/main/java/com/dituhui/pea/order/service/impl/EngineerCalendarServiceImpl.java
project-order/src/main/java/com/dituhui/pea/order/service/impl/EngineerCalendarServiceImpl.java
View file @
d0a16b0
...
@@ -274,7 +274,9 @@ public class EngineerCalendarServiceImpl implements EngineerCalendarService {
...
@@ -274,7 +274,9 @@ public class EngineerCalendarServiceImpl implements EngineerCalendarService {
LocalDateTime
startTime
=
DateUtils
.
localDateTimeFromStr
(
beginTime
);
LocalDateTime
startTime
=
DateUtils
.
localDateTimeFromStr
(
beginTime
);
LocalDateTime
endTime1
=
DateUtils
.
localDateTimeFromStr
(
endTime
);
LocalDateTime
endTime1
=
DateUtils
.
localDateTimeFromStr
(
endTime
);
if
(
checkTimesHasOverlap
(
endDate
,
engineerCode
,
startTime
,
endTime1
))
{
if
(
checkTimesHasOverlap
(
endDate
,
engineerCode
,
startTime
,
endTime1
))
{
throw
new
BusinessException
(
"工程师"
+
engineerCode
+
"存在交叉的日期日历"
+
DateTimeUtil
.
formatDate
(
endDate
));
throw
new
BusinessException
(
"工号为"
+
engineerCode
+
"的工程师在"
+
DateTimeUtil
.
formatDateTime
(
startTime
)
+
"到"
+
DateTimeUtil
.
formatDateTime
(
endTime1
)
+
"区间已有日程安排"
);
}
}
// 设定的是同一天,简单处理
// 设定的是同一天,简单处理
CapacityEngineerCalendarEntity
e
=
new
CapacityEngineerCalendarEntity
();
CapacityEngineerCalendarEntity
e
=
new
CapacityEngineerCalendarEntity
();
...
@@ -325,7 +327,9 @@ public class EngineerCalendarServiceImpl implements EngineerCalendarService {
...
@@ -325,7 +327,9 @@ public class EngineerCalendarServiceImpl implements EngineerCalendarService {
}
}
//校验是否有当天时间段的记录
//校验是否有当天时间段的记录
if
(
checkTimesHasOverlap
(
current
,
engineerCode
,
e
.
getStartTime
(),
e
.
getEndTime
()))
{
if
(
checkTimesHasOverlap
(
current
,
engineerCode
,
e
.
getStartTime
(),
e
.
getEndTime
()))
{
throw
new
BusinessException
(
"工程师"
+
engineerCode
+
"存在交叉的日期日历"
+
DateTimeUtil
.
formatDate
(
current
));
throw
new
BusinessException
(
"工号为"
+
engineerCode
+
"的工程师在"
+
DateTimeUtil
.
formatDateTime
(
e
.
getStartTime
())
+
"到"
+
DateTimeUtil
.
formatDateTime
(
e
.
getStartTime
())
+
"区间已有日程安排"
);
}
}
e
.
setWorkday
(
DateUtils
.
formatDate
(
current
));
e
.
setWorkday
(
DateUtils
.
formatDate
(
current
));
...
...
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