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
343579cd
Commit
343579cd
authored
4 years ago
by
leialin
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'lal' into 'develop'
提交 See merge request 8timerv2/8timerapiv200!413
parents
08861aa9
a41ddeaa
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
13 additions
and
4 deletions
+13
-4
src/main/java/cn/timer/api/controller/kqgl/ClockInController.java
+13
-4
No files found.
src/main/java/cn/timer/api/controller/kqgl/ClockInController.java
View file @
343579cd
...
...
@@ -1009,7 +1009,7 @@ public class ClockInController {
KqglAssoDkjl
.
builder
().
id
(
dkjj
.
getId
()).
status
(
0
).
sort
(
0
).
build
().
updateById
();
msg
=
"打卡已更新数据"
;
sbyf
=
0
;
status_
=
2
;
//
status_ = 2;
}
int
results
=
0
;
...
...
@@ -2342,7 +2342,7 @@ public class ClockInController {
KqglAssoDkjl
.
builder
().
id
(
dkjj
.
getId
()).
status
(
0
).
sort
(
0
).
build
().
updateById
();
msg
=
"打卡已更新数据"
;
sbyf
=
0
;
status_
=
2
;
//
status_ = 2;
}
int
results
=
0
;
...
...
@@ -2682,7 +2682,7 @@ public class ClockInController {
ash
.
setIsdk
(
1
);
if
(!
now
.
equals
(
timme
))
{
//小于
if
(!
now
.
equals
(
timme
))
{
ash
.
setIsupdate
(
0
);
}
else
{
...
...
@@ -2699,7 +2699,7 @@ public class ClockInController {
bc
++;
ash
.
setIsdk
(
1
);
if
(!
now
.
equals
(
timme
))
{
//小于
if
(!
now
.
equals
(
timme
))
{
ash
.
setIsupdate
(
0
);
}
else
{
if
(
isxbdk
==
2
)
{
...
...
@@ -2797,6 +2797,15 @@ public class ClockInController {
int
bcid
=
dkjl
.
getBcid
();
int
results
=
dkjl
.
getResults
();
KqglAssoBcsz
bcsz
=
KqglAssoBcsz
.
builder
().
build
().
selectOne
(
new
QueryWrapper
<
KqglAssoBcsz
>().
lambda
().
eq
(
KqglAssoBcsz:
:
getId
,
bcid
));
if
(
now
.
equals
(
ClockInTool
.
stampToDate2
(
String
.
valueOf
(
ash
.
getTime
()))))
{
if
(
attdate
.
getAttsch
().
size
()
==
2
)
{
if
(
dkjl
.
getSort
()
==
2
)
{
ash
.
setIsupdate
(
1
);
}
}
}
if
(
bcsz
!=
null
)
{
int
yxcdfzs
=
bcsz
.
getYxcdfzs
();
//允许迟到分钟数
int
yzcdfzs
=
bcsz
.
getYzcdfzs
();
//严重迟到分钟数
...
...
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