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
638fa38d
Commit
638fa38d
authored
Nov 24, 2020
by
leialin
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'lal' into 'develop'
提交修复BUG See merge request 8timerv2/8timerapiv200!549
parents
d7aa86de
b91f17e4
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
24 additions
and
5 deletions
+24
-5
src/main/java/cn/timer/api/controller/kqgl/atttimer/AttendanceTaskTiming.java
+10
-2
src/main/java/cn/timer/api/controller/kqgl/atttimer/LastMonthtimingExport.java
+8
-2
src/main/java/cn/timer/api/controller/kqgl/atttimer/RealTimeUpdate.java
+6
-1
No files found.
src/main/java/cn/timer/api/controller/kqgl/atttimer/AttendanceTaskTiming.java
View file @
638fa38d
...
@@ -101,7 +101,7 @@ public class AttendanceTaskTiming{
...
@@ -101,7 +101,7 @@ public class AttendanceTaskTiming{
//typeid:1-员工 2-考勤组
//typeid:1-员工 2-考勤组
// @Scheduled(cron = "0 */5 * * * ?")
// @Scheduled(cron = "0 */5 * * * ?")
// @Scheduled(cron = "0
8 11
* * ?")
// @Scheduled(cron = "0
19 18
* * ?")
@Scheduled
(
cron
=
"0 0 8,12,16,20 * * ?"
)
//每天上午8、12点,下午16点,20点 执行
@Scheduled
(
cron
=
"0 0 8,12,16,20 * * ?"
)
//每天上午8、12点,下午16点,20点 执行
public
void
AttendanceTask
()
throws
ParseException
{
public
void
AttendanceTask
()
throws
ParseException
{
...
@@ -171,8 +171,14 @@ public class AttendanceTaskTiming{
...
@@ -171,8 +171,14 @@ public class AttendanceTaskTiming{
//目前为止打卡记录
//目前为止打卡记录
List
<
PunchCardDetails
>
attendance
=
punchcarddetailsmapper
.
selectAttendanceDays
(
user
.
getEmpnum
(),
startDate
,
endDate
);
List
<
PunchCardDetails
>
attendance
=
punchcarddetailsmapper
.
selectAttendanceDays
(
user
.
getEmpnum
(),
startDate
,
endDate
);
int
fdjjrnum
=
0
;
if
(
attgro
!=
null
)
{
//特殊日期中 为法定带薪休假的
//特殊日期中 为法定带薪休假的
List
<
KqglAssoTeshu
>
fdjjr
=
KqglAssoTeshu
.
builder
().
build
().
selectList
(
new
QueryWrapper
<
KqglAssoTeshu
>().
lambda
().
eq
(
KqglAssoTeshu:
:
getKqzid
,
attgro
.
getId
()).
eq
(
KqglAssoTeshu:
:
getLegalday
,
1
).
eq
(
KqglAssoTeshu:
:
getType
,
2
));
List
<
KqglAssoTeshu
>
fdjjr
=
KqglAssoTeshu
.
builder
().
build
().
selectList
(
new
QueryWrapper
<
KqglAssoTeshu
>().
lambda
().
eq
(
KqglAssoTeshu:
:
getKqzid
,
attgro
.
getId
()).
eq
(
KqglAssoTeshu:
:
getLegalday
,
1
).
eq
(
KqglAssoTeshu:
:
getType
,
2
));
fdjjrnum
=
fdjjr
.
size
();
}
int
dkjl
=
0
;
//目前为止打卡次数
int
dkjl
=
0
;
//目前为止打卡次数
int
sbqkcs
=
0
,
xbqkcs
=
0
,
dk
=
0
;
int
sbqkcs
=
0
,
xbqkcs
=
0
,
dk
=
0
;
...
@@ -181,7 +187,7 @@ public class AttendanceTaskTiming{
...
@@ -181,7 +187,7 @@ public class AttendanceTaskTiming{
String
[]
dkjtts
=
new
String
[
attendance
.
size
()];
//目前打卡日期明细
String
[]
dkjtts
=
new
String
[
attendance
.
size
()];
//目前打卡日期明细
int
bccs
=
0
;
int
bccs
=
0
;
if
(
attendance
.
size
()
>
0
)
{
if
(
attendance
.
size
()
>
0
)
{
dkjl
=
attendance
.
size
()
+
fdjjr
.
size
()
;
dkjl
=
attendance
.
size
()
+
fdjjr
num
;
for
(
PunchCardDetails
pcd:
attendance
){
for
(
PunchCardDetails
pcd:
attendance
){
AttendanceCardListDto
attdate
=
MethodCall
(
org_code
,
user
.
getEmpnum
(),
pcd
.
getData
());
AttendanceCardListDto
attdate
=
MethodCall
(
org_code
,
user
.
getEmpnum
(),
pcd
.
getData
());
List
<
AttSchedule
>
ashss
=
attdate
.
getAttsch
();
//获取今天应打卡时间
List
<
AttSchedule
>
ashss
=
attdate
.
getAttsch
();
//获取今天应打卡时间
...
@@ -324,9 +330,11 @@ public class AttendanceTaskTiming{
...
@@ -324,9 +330,11 @@ public class AttendanceTaskTiming{
}
}
if
(
appmaps
.
length
>
0
)
{
if
(
appmaps
.
length
>
0
)
{
for
(
String
aa
:
ClockInTool
.
deleteArrayNull
(
zdxx
))
{
for
(
String
aa
:
ClockInTool
.
deleteArrayNull
(
zdxx
))
{
if
(
appmaps
.
length
>
0
)
{
appmaps
=
ClockInTool
.
doChinFilters
(
ClockInTool
.
deleteArrayNull
(
appmaps
),
aa
);
appmaps
=
ClockInTool
.
doChinFilters
(
ClockInTool
.
deleteArrayNull
(
appmaps
),
aa
);
}
}
}
}
}
//全月时间 - 应打卡时间 - 必须打卡时间 + 无需打卡时间
//全月时间 - 应打卡时间 - 必须打卡时间 + 无需打卡时间
...
...
src/main/java/cn/timer/api/controller/kqgl/atttimer/LastMonthtimingExport.java
View file @
638fa38d
...
@@ -93,7 +93,7 @@ public class LastMonthtimingExport {
...
@@ -93,7 +93,7 @@ public class LastMonthtimingExport {
SimpleDateFormat
format
=
new
SimpleDateFormat
(
"yyyy-MM-dd"
);
SimpleDateFormat
format
=
new
SimpleDateFormat
(
"yyyy-MM-dd"
);
// @Scheduled(cron = "0
48 16
* * ?")
// @Scheduled(cron = "0
31 18
* * ?")
@Scheduled
(
cron
=
"0 0 4,20 * * ?"
)
//每天上午4点,下午20点 执行
@Scheduled
(
cron
=
"0 0 4,20 * * ?"
)
//每天上午4点,下午20点 执行
public
void
LastMonthtimingAttendanceTask
()
throws
ParseException
{
public
void
LastMonthtimingAttendanceTask
()
throws
ParseException
{
...
@@ -161,8 +161,12 @@ public class LastMonthtimingExport {
...
@@ -161,8 +161,12 @@ public class LastMonthtimingExport {
//目前为止打卡记录
//目前为止打卡记录
List
<
PunchCardDetails
>
attendance
=
punchcarddetailsmapper
.
selectAttendanceDays
(
user
.
getEmpnum
(),
startDate
,
endDate
);
List
<
PunchCardDetails
>
attendance
=
punchcarddetailsmapper
.
selectAttendanceDays
(
user
.
getEmpnum
(),
startDate
,
endDate
);
int
fdjjrnum
=
0
;
if
(
attgro
!=
null
)
{
//特殊日期中 为法定带薪休假的
//特殊日期中 为法定带薪休假的
List
<
KqglAssoTeshu
>
fdjjr
=
KqglAssoTeshu
.
builder
().
build
().
selectList
(
new
QueryWrapper
<
KqglAssoTeshu
>().
lambda
().
eq
(
KqglAssoTeshu:
:
getKqzid
,
attgro
.
getId
()).
eq
(
KqglAssoTeshu:
:
getLegalday
,
1
).
eq
(
KqglAssoTeshu:
:
getType
,
2
));
List
<
KqglAssoTeshu
>
fdjjr
=
KqglAssoTeshu
.
builder
().
build
().
selectList
(
new
QueryWrapper
<
KqglAssoTeshu
>().
lambda
().
eq
(
KqglAssoTeshu:
:
getKqzid
,
attgro
.
getId
()).
eq
(
KqglAssoTeshu:
:
getLegalday
,
1
).
eq
(
KqglAssoTeshu:
:
getType
,
2
));
fdjjrnum
=
fdjjr
.
size
();
}
int
dkjl
=
0
;
//目前为止打卡次数
int
dkjl
=
0
;
//目前为止打卡次数
int
sbqkcs
=
0
,
xbqkcs
=
0
,
dk
=
0
;
int
sbqkcs
=
0
,
xbqkcs
=
0
,
dk
=
0
;
...
@@ -171,7 +175,7 @@ public class LastMonthtimingExport {
...
@@ -171,7 +175,7 @@ public class LastMonthtimingExport {
String
[]
dkjtts
=
new
String
[
attendance
.
size
()];
//目前打卡日期明细
String
[]
dkjtts
=
new
String
[
attendance
.
size
()];
//目前打卡日期明细
int
bccs
=
0
;
int
bccs
=
0
;
if
(
attendance
.
size
()
>
0
)
{
if
(
attendance
.
size
()
>
0
)
{
dkjl
=
attendance
.
size
()
+
fdjjr
.
size
()
;
dkjl
=
attendance
.
size
()
+
fdjjr
num
;
for
(
PunchCardDetails
pcd:
attendance
){
for
(
PunchCardDetails
pcd:
attendance
){
AttendanceCardListDto
attdate
=
MethodCall
(
org_code
,
user
.
getEmpnum
(),
pcd
.
getData
());
AttendanceCardListDto
attdate
=
MethodCall
(
org_code
,
user
.
getEmpnum
(),
pcd
.
getData
());
List
<
AttSchedule
>
ashss
=
attdate
.
getAttsch
();
//获取今天应打卡时间
List
<
AttSchedule
>
ashss
=
attdate
.
getAttsch
();
//获取今天应打卡时间
...
@@ -316,9 +320,11 @@ public class LastMonthtimingExport {
...
@@ -316,9 +320,11 @@ public class LastMonthtimingExport {
// System.out.println(zdxx);
// System.out.println(zdxx);
if
(
appmaps
.
length
>
0
)
{
if
(
appmaps
.
length
>
0
)
{
for
(
String
aa
:
ClockInTool
.
deleteArrayNull
(
zdxx
))
{
for
(
String
aa
:
ClockInTool
.
deleteArrayNull
(
zdxx
))
{
if
(
appmaps
.
length
>
0
)
{
appmaps
=
ClockInTool
.
doChinFilters
(
ClockInTool
.
deleteArrayNull
(
appmaps
),
aa
);
appmaps
=
ClockInTool
.
doChinFilters
(
ClockInTool
.
deleteArrayNull
(
appmaps
),
aa
);
}
}
}
}
}
//全月时间 - 应打卡时间 - 必须打卡时间 + 无需打卡时间
//全月时间 - 应打卡时间 - 必须打卡时间 + 无需打卡时间
int
xiuxi
=
ClockInTool
.
getDaysByYearMonth
(
year
,
month
)
-
q
-
bxdk
+
appmaps
.
length
+
jj
;
//ClockInTool.getDaysByYearMonth(year,month) - q - bxdk + wxdk.size()+jj;
int
xiuxi
=
ClockInTool
.
getDaysByYearMonth
(
year
,
month
)
-
q
-
bxdk
+
appmaps
.
length
+
jj
;
//ClockInTool.getDaysByYearMonth(year,month) - q - bxdk + wxdk.size()+jj;
...
...
src/main/java/cn/timer/api/controller/kqgl/atttimer/RealTimeUpdate.java
View file @
638fa38d
...
@@ -152,8 +152,13 @@ public class RealTimeUpdate{
...
@@ -152,8 +152,13 @@ public class RealTimeUpdate{
//目前为止打卡记录
//目前为止打卡记录
List
<
PunchCardDetails
>
attendance
=
punchcarddetailsmapper
.
selectAttendanceDays
(
user
.
getEmpnum
(),
startDate
,
endDateyesterday
);
List
<
PunchCardDetails
>
attendance
=
punchcarddetailsmapper
.
selectAttendanceDays
(
user
.
getEmpnum
(),
startDate
,
endDateyesterday
);
int
fdjjrnum
=
0
;
if
(
attgro
!=
null
)
{
//特殊日期中 为法定带薪休假的
//特殊日期中 为法定带薪休假的
List
<
KqglAssoTeshu
>
fdjjr
=
KqglAssoTeshu
.
builder
().
build
().
selectList
(
new
QueryWrapper
<
KqglAssoTeshu
>().
lambda
().
eq
(
KqglAssoTeshu:
:
getKqzid
,
attgro
.
getId
()).
eq
(
KqglAssoTeshu:
:
getLegalday
,
1
).
eq
(
KqglAssoTeshu:
:
getType
,
2
));
List
<
KqglAssoTeshu
>
fdjjr
=
KqglAssoTeshu
.
builder
().
build
().
selectList
(
new
QueryWrapper
<
KqglAssoTeshu
>().
lambda
().
eq
(
KqglAssoTeshu:
:
getKqzid
,
attgro
.
getId
()).
eq
(
KqglAssoTeshu:
:
getLegalday
,
1
).
eq
(
KqglAssoTeshu:
:
getType
,
2
));
fdjjrnum
=
fdjjr
.
size
();
}
int
dkjl
=
0
;
//目前为止打卡次数
int
dkjl
=
0
;
//目前为止打卡次数
int
sbqkcs
=
0
,
xbqkcs
=
0
,
dk
=
0
;
int
sbqkcs
=
0
,
xbqkcs
=
0
,
dk
=
0
;
...
@@ -162,7 +167,7 @@ public class RealTimeUpdate{
...
@@ -162,7 +167,7 @@ public class RealTimeUpdate{
String
[]
dkjtts
=
new
String
[
attendance
.
size
()];
//目前打卡日期明细
String
[]
dkjtts
=
new
String
[
attendance
.
size
()];
//目前打卡日期明细
int
bccs
=
0
;
int
bccs
=
0
;
if
(
attendance
.
size
()
>
0
)
{
if
(
attendance
.
size
()
>
0
)
{
dkjl
=
attendance
.
size
()
+
fdjjr
.
size
()
;
dkjl
=
attendance
.
size
()
+
fdjjr
num
;
for
(
PunchCardDetails
pcd:
attendance
){
for
(
PunchCardDetails
pcd:
attendance
){
AttendanceCardListDto
attdate
=
MethodCall
(
org_code
,
user
.
getEmpnum
(),
pcd
.
getData
());
AttendanceCardListDto
attdate
=
MethodCall
(
org_code
,
user
.
getEmpnum
(),
pcd
.
getData
());
List
<
AttSchedule
>
ashss
=
attdate
.
getAttsch
();
//获取今天应打卡时间
List
<
AttSchedule
>
ashss
=
attdate
.
getAttsch
();
//获取今天应打卡时间
...
...
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