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 9c1fffb1
authored
Aug 04, 2023
by
丁伟峰
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
根据0803的商议,正常上班的日历不必在日历中显示
1 parent
b24e7a6f
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 additions
and
5 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 @
9c1fffb
...
...
@@ -245,11 +245,7 @@ public class EngineerCalendarServiceImpl implements EngineerCalendarService {
calendar
.
setWeek
(
DateUtils
.
toWeekChinese
(
dayOfWeek
));
EngineerCalendarDTO
.
Content
content
=
new
EngineerCalendarDTO
.
Content
();
List
<
String
>
workdays
=
Arrays
.
asList
(
e
.
getWorkdays
().
split
(
","
));
if
(
workdays
.
contains
(
String
.
valueOf
(
dayOfWeek
)))
{
content
.
setType
(
"WORKING"
);
content
.
setTitle
(
String
.
format
(
"%s-%s"
,
e
.
getWorkOn
(),
e
.
getWorkOff
()));
content
.
setValue
(
getCalendarDuration
(
e
.
getWorkOn
(),
e
.
getWorkOff
()));
}
else
{
if
(!
workdays
.
contains
(
String
.
valueOf
(
dayOfWeek
)))
{
content
.
setType
(
"REST"
);
content
.
setTitle
(
"休息"
);
}
...
...
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