Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
A
attendance-performance-platform
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
赵啸非
attendance-performance-platform
Commits
36ebcea5
Commit
36ebcea5
authored
May 20, 2024
by
廖旭伟
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
考勤汇总节假日周末补班没有正常汇总bug修改
parent
c65ac0b9
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
8 additions
and
1 deletion
+8
-1
attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/service/impl/AttendanceStatServiceImpl.java
...le/attendance/service/impl/AttendanceStatServiceImpl.java
+8
-1
No files found.
attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/service/impl/AttendanceStatServiceImpl.java
View file @
36ebcea5
...
@@ -210,7 +210,14 @@ public class AttendanceStatServiceImpl extends AbstractCRUDServiceImpl<Attendanc
...
@@ -210,7 +210,14 @@ public class AttendanceStatServiceImpl extends AbstractCRUDServiceImpl<Attendanc
Calendar
cal
=
Calendar
.
getInstance
();
Calendar
cal
=
Calendar
.
getInstance
();
cal
.
setTime
(
summaryDate
);
cal
.
setTime
(
summaryDate
);
int
dayOfWeek
=
cal
.
get
(
Calendar
.
DAY_OF_WEEK
);
int
dayOfWeek
=
cal
.
get
(
Calendar
.
DAY_OF_WEEK
);
query
.
setDayOfWeek
(
dayOfWeek
);
if
(
dayOfWeek
==
1
||
dayOfWeek
==
7
){
//节假日周末补班
if
(!
isReturn
){
query
.
setDayOfWeek
(
2
);
}
}
else
{
query
.
setDayOfWeek
(
dayOfWeek
);
}
int
y
=
cal
.
get
(
Calendar
.
YEAR
);
int
y
=
cal
.
get
(
Calendar
.
YEAR
);
int
m
=
cal
.
get
(
Calendar
.
MONTH
)+
1
;
int
m
=
cal
.
get
(
Calendar
.
MONTH
)+
1
;
int
d
=
cal
.
get
(
Calendar
.
DATE
);
int
d
=
cal
.
get
(
Calendar
.
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