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
41af1573
Commit
41af1573
authored
Aug 13, 2020
by
leialin
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'lal' into 'develop'
Lal See merge request 8timerv2/8timerapiv200!434
parents
b5d56062
46ad4550
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
2 deletions
+4
-2
src/main/java/cn/timer/api/controller/kqgl/ClockInController.java
+4
-2
No files found.
src/main/java/cn/timer/api/controller/kqgl/ClockInController.java
View file @
41af1573
...
...
@@ -2605,7 +2605,7 @@ public class ClockInController {
boolean
iscrdk
=
true
;
String
crlasttime
=
null
;
//次日最后打卡时间
boolean
bycf
=
true
;
/****************
次
日开始***************/
/****************
昨
日开始***************/
int
sb1
=
0
,
xb1
=
0
,
sb2
=
0
,
xb2
=
0
,
sb3
=
0
,
xb3
=
0
;
//先判断前一天是否存在次日打卡的方式
KqglAssoBcsz
jianchashif
=
KqglAssoBcsz
.
builder
().
build
().
selectOne
(
new
QueryWrapper
<
KqglAssoBcsz
>().
lambda
().
eq
(
KqglAssoBcsz:
:
getId
,
attsch
.
get
(
0
).
getId
()));
...
...
@@ -2680,6 +2680,7 @@ public class ClockInController {
if
(
ectivedate
)
{
attschbefo
.
setIsdk
(
0
);
}
else
{
bc
++;
attschbefo
.
setIsdk
(
1
);
}
}
...
...
@@ -2687,6 +2688,7 @@ public class ClockInController {
if
(
ectivedate
)
{
attschbefo
.
setIsdk
(
0
);
}
else
{
bc
++;
attschbefo
.
setIsdk
(
1
);
}
}
...
...
@@ -2728,7 +2730,7 @@ public class ClockInController {
}
}
/****************
次
日结束***************/
/****************
昨
日结束***************/
int
bccs
=
attdate
.
getAttsch
().
size
();
int
r
=
1
;
...
...
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