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
b854fd5f
Commit
b854fd5f
authored
4 years ago
by
ilal
Committed by
chenzg
3 years ago
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
提交
parent
68bb8348
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
36 additions
and
9 deletions
+36
-9
src/main/java/cn/timer/api/controller/kqgl/ClockInController.java
+36
-9
No files found.
src/main/java/cn/timer/api/controller/kqgl/ClockInController.java
View file @
b854fd5f
...
...
@@ -2568,18 +2568,31 @@ public class ClockInController {
int
bsz
=
0
;
int
cr
=
0
;
boolean
iscrdk
=
true
;
String
crlasttime
=
null
;
//次日最后打卡时间
/****************次日开始***************/
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
()));
if
(
jianchashif
.
getIsSbdk1Cr
()
==
1
)
{
sb1
=
1
;
}
if
(
jianchashif
.
getIsXbdk1Cr
()
==
1
)
{
xb1
=
1
;
}
if
(
jianchashif
.
getIsSbdk2Cr
()
==
1
)
{
sb2
=
1
;
}
if
(
jianchashif
.
getIsXbdk2Cr
()
==
1
)
{
xb2
=
1
;
}
if
(
jianchashif
.
getIsSbdk3Cr
()
==
1
)
{
sb3
=
1
;
}
if
(
jianchashif
.
getIsXbdk3Cr
()
==
1
)
{
xb3
=
1
;
}
if
(
jianchashif
.
getIsSbdk1Cr
()
==
1
)
{
sb1
=
1
;
crlasttime
=
(
str
+
" "
+
jianchashif
.
getSbdk1
()+
":00"
).
replaceAll
(
"\r|\n"
,
""
);}
if
(
jianchashif
.
getIsXbdk1Cr
()
==
1
)
{
xb1
=
1
;
crlasttime
=
(
str
+
" "
+
jianchashif
.
getXbdk1
()+
":00"
).
replaceAll
(
"\r|\n"
,
""
);}
if
(
jianchashif
.
getIsSbdk2Cr
()
==
1
)
{
sb2
=
1
;
crlasttime
=
(
str
+
" "
+
jianchashif
.
getSbdk2
()+
":00"
).
replaceAll
(
"\r|\n"
,
""
);}
if
(
jianchashif
.
getIsXbdk2Cr
()
==
1
)
{
xb2
=
1
;
crlasttime
=
(
str
+
" "
+
jianchashif
.
getXbdk2
()+
":00"
).
replaceAll
(
"\r|\n"
,
""
);}
if
(
jianchashif
.
getIsSbdk3Cr
()
==
1
)
{
sb3
=
1
;
crlasttime
=
(
str
+
" "
+
jianchashif
.
getSbdk3
()+
":00"
).
replaceAll
(
"\r|\n"
,
""
);}
if
(
jianchashif
.
getIsXbdk3Cr
()
==
1
)
{
xb3
=
1
;
crlasttime
=
(
str
+
" "
+
jianchashif
.
getXbdk3
()+
":00"
).
replaceAll
(
"\r|\n"
,
""
);}
//
if
(
sb1
==
1
||
xb1
==
1
||
sb2
==
1
||
xb2
==
1
||
sb3
==
1
||
xb3
==
1
)
{
if
(
sb1
==
1
||
xb1
==
1
||
sb2
==
1
||
xb2
==
1
||
sb3
==
1
||
xb3
==
1
)
{
//前一天的班次
AttendanceCardListDto
beforeattdate
=
MethodCall
(
userBean
.
getOrgCode
(),
userBean
.
getEmpNum
(),
yesterday
);
//前一天的打卡数据
...
...
@@ -3031,10 +3044,24 @@ public class ClockInController {
}
else
{
if
(
iscrdk
)
{
AttSchedule
attc
=
attsch
.
get
(
0
);
if
(
attc
.
getDajl
().
getStatus
()
==
17
&&
attc
.
getDajl
().
getId
()
==
888
)
{
attc
.
getDajl
().
setId
(
null
);
attc
.
getDajl
().
setSort
(
null
);
attc
.
getDajl
().
setStatus
(
null
);
}
attc
.
setIsdk
(
0
);
}
else
{
AttSchedule
attc
=
attsch
.
get
(
cr
);
attc
.
setIsdk
(
0
);
if
(
crlasttime
!=
null
)
{
Timestamp
dd
=
Timestamp
.
valueOf
(
crlasttime
);
if
(
dd
.
after
(
b
))
{
//after:大于 before:小于
AttSchedule
attc
=
attsch
.
get
(
0
);
attc
.
setIsdk
(
0
);
}
else
{
AttSchedule
attc
=
attsch
.
get
(
cr
);
attc
.
setIsdk
(
0
);
}
}
}
}
...
...
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