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
e570dcba
Commit
e570dcba
authored
4 years ago
by
leialin
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'lal' into 'develop'
提交 See merge request 8timerv2/8timerapiv200!422
parents
68737c51
572a5e1a
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
27 additions
and
4 deletions
+27
-4
src/main/java/cn/timer/api/controller/kqgl/ClockInController.java
+27
-4
No files found.
src/main/java/cn/timer/api/controller/kqgl/ClockInController.java
View file @
e570dcba
...
@@ -1534,6 +1534,8 @@ public class ClockInController {
...
@@ -1534,6 +1534,8 @@ public class ClockInController {
// }
// }
}
}
}
else
{
}
else
{
List
<
AttSchedule
>
ashss
=
attdate
.
getAttsch
();
//获取今天应打卡时间
//无记录的话就找昨天的数据
//无记录的话就找昨天的数据
AttendanceCardListDto
attdate1
=
MethodCall
(
qyid
,
userid
,
yesterday
);
AttendanceCardListDto
attdate1
=
MethodCall
(
qyid
,
userid
,
yesterday
);
List
<
AttSchedule
>
ashssyebo
=
attdate1
.
getAttsch
();
//获取昨天应打卡时间
List
<
AttSchedule
>
ashssyebo
=
attdate1
.
getAttsch
();
//获取昨天应打卡时间
...
@@ -1545,9 +1547,26 @@ public class ClockInController {
...
@@ -1545,9 +1547,26 @@ public class ClockInController {
}
}
}
}
crdk
=
true
;
attdate
=
MethodCall
(
qyid
,
userid
,
yesterday
);
if
(
EmptyUtil
.
isNotEmpty
(
attdate
.
getAttsch
())
&&
ashss
.
get
(
0
).
getId
()
!=
0
)
{
//班次不为空
KqglAssoBcsz
shifi
=
KqglAssoBcsz
.
builder
().
build
().
selectOne
(
new
QueryWrapper
<
KqglAssoBcsz
>().
lambda
().
eq
(
KqglAssoBcsz:
:
getId
,
ashss
.
get
(
0
).
getId
()));
int
isXbdk1Cr
=
shifi
.
getIsXbdk1Cr
();
//下班1是否次日(0:否;1:是)
int
isSbdk2Cr
=
shifi
.
getIsSbdk2Cr
();
//上班2是否次日(0:否;1:是)
int
isXbdk2Cr
=
shifi
.
getIsXbdk2Cr
();
//下班2是否次日(0:否;1:是)
int
isSbdk3Cr
=
shifi
.
getIsSbdk3Cr
();
//上班3是否次日(0:否;1:是)
int
isXbdk3Cr
=
shifi
.
getIsXbdk3Cr
();
//下班3是否次日(0:否;1:是)
if
((
isXbdk1Cr
+
isSbdk2Cr
+
isXbdk2Cr
+
isSbdk3Cr
+
isXbdk3Cr
)
>
0
)
{
crdk
=
true
;
attdate
=
MethodCall
(
qyid
,
userid
,
yesterday
);
}
else
{
crdk
=
false
;
}
}
}
}
if
(
crdk
&&
dnck
)
{
if
(
crdk
&&
dnck
)
{
dkmc
=
KqglAssoDkmx
.
builder
().
build
().
selectOne
(
new
QueryWrapper
<
KqglAssoDkmx
>().
lambda
().
eq
(
KqglAssoDkmx:
:
getUserid
,
userid
)
dkmc
=
KqglAssoDkmx
.
builder
().
build
().
selectOne
(
new
QueryWrapper
<
KqglAssoDkmx
>().
lambda
().
eq
(
KqglAssoDkmx:
:
getUserid
,
userid
)
...
@@ -2585,6 +2604,7 @@ public class ClockInController {
...
@@ -2585,6 +2604,7 @@ public class ClockInController {
int
cr
=
0
;
int
cr
=
0
;
boolean
iscrdk
=
true
;
boolean
iscrdk
=
true
;
String
crlasttime
=
null
;
//次日最后打卡时间
String
crlasttime
=
null
;
//次日最后打卡时间
boolean
bycf
=
true
;
/****************次日开始***************/
/****************次日开始***************/
int
sb1
=
0
,
xb1
=
0
,
sb2
=
0
,
xb2
=
0
,
sb3
=
0
,
xb3
=
0
;
int
sb1
=
0
,
xb1
=
0
,
sb2
=
0
,
xb2
=
0
,
sb3
=
0
,
xb3
=
0
;
//先判断前一天是否存在次日打卡的方式
//先判断前一天是否存在次日打卡的方式
...
@@ -2645,6 +2665,7 @@ public class ClockInController {
...
@@ -2645,6 +2665,7 @@ public class ClockInController {
}
}
if
(
dkjlbefo
.
getDktime
()
!=
null
)
{
if
(
dkjlbefo
.
getDktime
()
!=
null
)
{
bycf
=
false
;
bc
++;
bc
++;
attschbefo
.
setIsdk
(
1
);
attschbefo
.
setIsdk
(
1
);
}
else
{
}
else
{
...
@@ -2663,8 +2684,10 @@ public class ClockInController {
...
@@ -2663,8 +2684,10 @@ public class ClockInController {
}
}
}
else
{
}
else
{
bc
++;
if
(
bycf
)
{
attschbefo
.
setIsdk
(
1
);
bc
++;
attschbefo
.
setIsdk
(
1
);
}
}
}
}
}
...
...
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