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
6942a5b5
Commit
6942a5b5
authored
Jun 17, 2020
by
lal
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修复BUG
parent
188f52b8
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
0 deletions
+2
-0
src/main/java/cn/timer/api/controller/kqgl/ClockInController.java
+2
-0
src/main/resources/mapping/kqmk/KqglAssoMonthPunchSummaryMapper.xml
+0
-0
No files found.
src/main/java/cn/timer/api/controller/kqgl/ClockInController.java
View file @
6942a5b5
...
@@ -268,6 +268,7 @@ public class ClockInController {
...
@@ -268,6 +268,7 @@ public class ClockInController {
Map
<
String
,
Integer
>
comparemap
=
new
HashMap
();
Map
<
String
,
Integer
>
comparemap
=
new
HashMap
();
if
(
dkmc
==
null
)
{
if
(
dkmc
==
null
)
{
kskd
=
false
;
//打卡时间 对比班次 接近哪个时间就打哪个时间的卡
//打卡时间 对比班次 接近哪个时间就打哪个时间的卡
if
(
attdate
.
getAttsch
().
size
()
==
2
||
attdate
.
getAttsch
().
size
()
==
4
||
attdate
.
getAttsch
().
size
()
==
6
)
{
if
(
attdate
.
getAttsch
().
size
()
==
2
||
attdate
.
getAttsch
().
size
()
==
4
||
attdate
.
getAttsch
().
size
()
==
6
)
{
comparemap
.
put
(
"1"
,
dakjg1
);
comparemap
.
put
(
"2"
,
dakjg2
);
comparemap
.
put
(
"1"
,
dakjg1
);
comparemap
.
put
(
"2"
,
dakjg2
);
...
@@ -290,6 +291,7 @@ public class ClockInController {
...
@@ -290,6 +291,7 @@ public class ClockInController {
}
}
//最后一次卡的时候 再继续打视为更新最后一次打卡
//最后一次卡的时候 再继续打视为更新最后一次打卡
if
(
dkmc
.
getXbdk1
()
!=
null
)
{
if
(
dkmc
.
getXbdk1
()
!=
null
)
{
kskd
=
true
;
comparemap
.
put
(
"2"
,
dakjg2
);
comparemap
.
put
(
"2"
,
dakjg2
);
}
}
}
}
...
...
src/main/resources/mapping/kqmk/KqglAssoMonthPunchSummaryMapper.xml
View file @
6942a5b5
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