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
3b1de114
Commit
3b1de114
authored
4 years ago
by
ilal
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
提交
parent
36fca6ec
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
21 additions
and
8 deletions
+21
-8
src/main/java/cn/timer/api/controller/kqgl/ClockInController.java
+21
-8
No files found.
src/main/java/cn/timer/api/controller/kqgl/ClockInController.java
View file @
3b1de114
...
...
@@ -3118,13 +3118,18 @@ public class ClockInController {
AttSchedule
att
=
attsch
.
get
(
dk
.
getSort
()-
cr
);
if
(
att
.
getDajl
().
getId
()
!=
null
&&
att
.
getDajl
().
getStatus
()
!=
17
&&
att
.
getDajl
().
getId
()
!=
888
)
{
att
.
setIsdk
(
0
);
AttSchedule
attw
=
attsch
.
get
(
dk
.
getSort
()-
1
);
attw
.
setIsupdate
(
1
);
}
else
{
AttSchedule
att1
=
attsch
.
get
(
dk
.
getSort
()+
cr
);
att1
.
setIsdk
(
0
);
AttSchedule
attw
=
attsch
.
get
(
dk
.
getSort
()+
cr
-
1
);
attw
.
setIsupdate
(
1
);
}
AttSchedule
attw
=
attsch
.
get
(
dk
.
getSort
()-
1
);
attw
.
setIsupdate
(
1
);
}
else
{
if
(
iscrdk
)
{
AttSchedule
attc
=
attsch
.
get
(
0
);
...
...
@@ -3147,12 +3152,16 @@ public class ClockInController {
attc
.
setIsdk
(
0
);
}
else
{
AttSchedule
attc
=
attsch
.
get
(
cr
);
if
(
attc
.
getDajl
().
getId
()
!=
null
&&
attc
.
getDajl
().
getStatus
()
==
17
&&
attc
.
getDajl
().
getId
()
==
888
)
{
attc
.
getDajl
().
setId
(
null
);
attc
.
getDajl
().
setSort
(
null
);
attc
.
getDajl
().
setStatus
(
null
);
}
attc
.
setIsdk
(
0
);
Timestamp
ag
=
Timestamp
.
valueOf
(
ClockInTool
.
stampToDate
(
String
.
valueOf
(
attc
.
getTime
())));
if
(
ag
.
after
(
b
))
{
if
(
attc
.
getDajl
().
getId
()
!=
null
&&
attc
.
getDajl
().
getStatus
()
==
17
&&
attc
.
getDajl
().
getId
()
==
888
)
{
attc
.
getDajl
().
setId
(
null
);
attc
.
getDajl
().
setSort
(
null
);
attc
.
getDajl
().
setStatus
(
null
);
}
attc
.
setIsdk
(
0
);
}
}
}
...
...
@@ -3160,6 +3169,10 @@ public class ClockInController {
}
}
//当全为缺卡时
}
else
{
//休息的时候
List
<
AttSchedule
>
attsch_
=
new
ArrayList
<
AttSchedule
>();
...
...
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