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
48dba697
Commit
48dba697
authored
Aug 19, 2024
by
赵啸非
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改请假计算考勤
parent
e7d15e14
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
0 additions
and
4 deletions
+0
-4
attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/service/work/FixWorkOtherAttendance.java
...odule/attendance/service/work/FixWorkOtherAttendance.java
+0
-4
No files found.
attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/service/work/FixWorkOtherAttendance.java
View file @
48dba697
...
...
@@ -405,10 +405,6 @@ public class FixWorkOtherAttendance extends AttendanceWorkAbstract {
//goWorkDate为空 缺卡状态
Date
goWorkDate1
=
attendanceClassDetailEntity
.
getGoWorkDate
();
//判断请假区间是否在上班区间内 如果在 则设置为请假 格式化时间范围
DateUtil
.
parse
(
DateUtil
.
format
(
startLeaveTime
,
"HH:mm:ss"
),
"HH:mm:ss"
)
;
DateUtil
.
parse
(
DateUtil
.
format
(
endLeaveTime
,
"HH:mm:ss"
),
"HH:mm:ss"
)
;
//DateUtil.
boolean
in
=
DateUtil
.
isIn
(
goWorkDate1
,
DateUtil
.
parse
(
DateUtil
.
format
(
startLeaveTime
,
"HH:mm:ss"
),
"HH:mm:ss"
),
DateUtil
.
parse
(
DateUtil
.
format
(
endLeaveTime
,
"HH:mm:ss"
),
"HH:mm:ss"
));
if
(
in
){
...
...
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