Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
8
8timerapiv200
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
8timerv2
8timerapiv200
Commits
1886689d
Commit
1886689d
authored
4 years ago
by
ilal
Committed by
chenzg
3 years ago
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
提交
parent
f6cb33b3
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
19 additions
and
1 deletions
+19
-1
src/main/java/cn/timer/api/controller/kqgl/ClockInController.java
+19
-1
No files found.
src/main/java/cn/timer/api/controller/kqgl/ClockInController.java
View file @
1886689d
...
...
@@ -2647,6 +2647,7 @@ public class ClockInController {
int
p
=
0
;
if
(
EmptyUtil
.
isNotEmpty
(
beforeattdate
.
getAttsch
())
&&
beforeattsch
.
get
(
0
).
getId
()
!=
0
)
{
int
g
=
1
;
for
(
AttSchedule
befo
:
beforeattsch
)
{
boolean
isdkjl
=
true
;
if
(
befo
.
getNextday
()
==
1
)
{
...
...
@@ -2673,7 +2674,24 @@ public class ClockInController {
}
if
(
beforeattdate
.
getAttsch
().
size
()
==
2
)
{
if
(
befo
.
getStarttime
()
!=
0
&&
befo
.
getEndtime
()
!=
0
)
{
boolean
ectivedate
=
ClockInTool
.
hourMinuteBetween
(
new
SimpleDateFormat
(
"yyyy-MM-dd HH:mm"
).
format
(
nowdate
),
new
SimpleDateFormat
(
"yyyy-MM-dd HH:mm"
).
format
(
befo
.
getStarttime
()),
new
SimpleDateFormat
(
"yyyy-MM-dd HH:mm"
).
format
(
befo
.
getEndtime
()),
"yyyy-MM-dd HH:mm"
);
if
(
g
==
1
)
{
if
(
ectivedate
)
{
attschbefo
.
setIsdk
(
0
);
}
else
{
attschbefo
.
setIsdk
(
1
);
}
}
if
(
g
==
2
)
{
if
(
ectivedate
)
{
attschbefo
.
setIsdk
(
0
);
}
else
{
attschbefo
.
setIsdk
(
1
);
}
}
g
++;
}
}
else
{
boolean
ectivedate
=
ClockInTool
.
hourMinuteBetween
(
new
SimpleDateFormat
(
"yyyy-MM-dd HH:mm"
).
format
(
nowdate
),
new
SimpleDateFormat
(
"yyyy-MM-dd HH:mm"
).
format
(
befo
.
getStarttime
()),
new
SimpleDateFormat
(
"yyyy-MM-dd HH:mm"
).
format
(
befo
.
getEndtime
()),
"yyyy-MM-dd HH:mm"
);
if
(
ectivedate
)
{
...
...
This diff is collapsed.
Click to expand it.
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