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
9d66585e
Commit
9d66585e
authored
4 years ago
by
ilal
Committed by
chenzg
3 years ago
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
提交
parent
e3c9496d
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
18 additions
and
11 deletions
+18
-11
src/main/java/cn/timer/api/controller/kqgl/ClockInTool.java
+4
-2
src/main/java/cn/timer/api/controller/kqgl/atttimer/AttendanceTaskTiming.java
+9
-5
src/main/java/cn/timer/api/controller/kqgl/atttimer/LastMonthtimingExport.java
+5
-4
No files found.
src/main/java/cn/timer/api/controller/kqgl/ClockInTool.java
View file @
9d66585e
...
@@ -363,8 +363,10 @@ public class ClockInTool {
...
@@ -363,8 +363,10 @@ public class ClockInTool {
Iterator
<
String
>
it
=
arrList
.
iterator
();
Iterator
<
String
>
it
=
arrList
.
iterator
();
while
(
it
.
hasNext
())
{
while
(
it
.
hasNext
())
{
String
x
=
it
.
next
();
String
x
=
it
.
next
();
if
(
x
.
indexOf
(
target
)
!=
-
1
)
{
if
(
x
!=
null
)
{
it
.
remove
();
if
(
x
.
indexOf
(
target
)
!=
-
1
)
{
it
.
remove
();
}
}
}
}
}
res
=
new
String
[
arrList
.
size
()];
res
=
new
String
[
arrList
.
size
()];
...
...
This diff is collapsed.
Click to expand it.
src/main/java/cn/timer/api/controller/kqgl/atttimer/AttendanceTaskTiming.java
View file @
9d66585e
...
@@ -98,7 +98,7 @@ public class AttendanceTaskTiming{
...
@@ -98,7 +98,7 @@ public class AttendanceTaskTiming{
//typeid:1-员工 2-考勤组
//typeid:1-员工 2-考勤组
// @Scheduled(cron = "0 */5 * * * ?")
// @Scheduled(cron = "0 */5 * * * ?")
// @Scheduled(cron = "0
42 14
* * ?")
// @Scheduled(cron = "0
0 11
* * ?")
@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
{
...
@@ -133,7 +133,7 @@ public class AttendanceTaskTiming{
...
@@ -133,7 +133,7 @@ public class AttendanceTaskTiming{
List
<
QyzxEntInfoM
>
orgcodelist
=
qyzxentinfommapper
.
selectList
(
new
QueryWrapper
<
QyzxEntInfoM
>());
//系统中的所有公司 所有未到期的公司
List
<
QyzxEntInfoM
>
orgcodelist
=
qyzxentinfommapper
.
selectList
(
new
QueryWrapper
<
QyzxEntInfoM
>());
//系统中的所有公司 所有未到期的公司
// List<QyzxEntInfoM> orgcodelist = qyzxentinfommapper.selectList(new QueryWrapper<QyzxEntInfoM>().lambda().eq(QyzxEntInfoM::getId,
3
));
// List<QyzxEntInfoM> orgcodelist = qyzxentinfommapper.selectList(new QueryWrapper<QyzxEntInfoM>().lambda().eq(QyzxEntInfoM::getId,
6
));
for
(
int
t
=
0
;
t
<
orgcodelist
.
size
();
t
++){
for
(
int
t
=
0
;
t
<
orgcodelist
.
size
();
t
++){
int
org_code
=
orgcodelist
.
get
(
t
).
getId
();
//企业组织代码
int
org_code
=
orgcodelist
.
get
(
t
).
getId
();
//企业组织代码
...
@@ -298,7 +298,7 @@ public class AttendanceTaskTiming{
...
@@ -298,7 +298,7 @@ public class AttendanceTaskTiming{
y
=
y
-
1
;
y
=
y
-
1
;
}
}
if
(
attgro
.
getIsFdjjr
().
equals
(
1
))
{
if
(
attgro
.
getIsFdjjr
().
equals
(
1
111
))
{
if
(
Arrays
.
asList
(
holidays
).
contains
(
String
.
valueOf
(
sdf1
.
format
(
date1
)))){
if
(
Arrays
.
asList
(
holidays
).
contains
(
String
.
valueOf
(
sdf1
.
format
(
date1
)))){
y
=
y
-
1
;
y
=
y
-
1
;
jj
++;
jj
++;
...
@@ -350,7 +350,11 @@ public class AttendanceTaskTiming{
...
@@ -350,7 +350,11 @@ public class AttendanceTaskTiming{
xxts
=
ClockInTool
.
doChinFilters
(
ClockInTool
.
deleteArrayNull
(
xxts
),
num
);
//为必须上班的话从休息日期中去除
xxts
=
ClockInTool
.
doChinFilters
(
ClockInTool
.
deleteArrayNull
(
xxts
),
num
);
//为必须上班的话从休息日期中去除
}
}
if
(
ClockInTool
.
useArrayUtils
(
appmaps
,
num
))
{
//检查是否存在 无需打卡名单中
if
(
ClockInTool
.
useArrayUtils
(
appmaps
,
num
))
{
//检查是否存在 无需打卡名单中
ycqts
=
ClockInTool
.
doChinFilters
(
ClockInTool
.
deleteArrayNull
(
ycqts
),
num
);
//为必须休息的话从上班日期中去除
ycqts
=
ClockInTool
.
doChinFilters
(
ycqts
,
num
);
//为必须休息的话从上班日期中去除
// ycqts = ClockInTool.doChinFilters(ClockInTool.deleteArrayNull(ycqts), num);//为必须休息的话从上班日期中去除
zjgzts
=
zjgzts
-
1
;
zjgzts
=
zjgzts
-
1
;
String
[]
xxtst
=
new
String
[
xxts
.
length
+
zj
];
String
[]
xxtst
=
new
String
[
xxts
.
length
+
zj
];
...
@@ -364,7 +368,7 @@ public class AttendanceTaskTiming{
...
@@ -364,7 +368,7 @@ public class AttendanceTaskTiming{
//当前考勤组开启法定节假日休息开关
//当前考勤组开启法定节假日休息开关
if
(
attgro
.
getIsFdjjr
().
equals
(
1
))
{
if
(
attgro
.
getIsFdjjr
().
equals
(
1
1111
))
{
//法定节假日
//法定节假日
if
(
ClockInTool
.
useArrayUtils
(
holidays
,
num
))
{
//法定节假日沦为休息日计算
if
(
ClockInTool
.
useArrayUtils
(
holidays
,
num
))
{
//法定节假日沦为休息日计算
// ycqts = ClockInTool.doChinFilters(ClockInTool.deleteArrayNull(ycqts), num);//为必须休息的话从上班日期中去除
// ycqts = ClockInTool.doChinFilters(ClockInTool.deleteArrayNull(ycqts), num);//为必须休息的话从上班日期中去除
...
...
This diff is collapsed.
Click to expand it.
src/main/java/cn/timer/api/controller/kqgl/atttimer/LastMonthtimingExport.java
View file @
9d66585e
...
@@ -90,7 +90,7 @@ public class LastMonthtimingExport {
...
@@ -90,7 +90,7 @@ public class LastMonthtimingExport {
SimpleDateFormat
format
=
new
SimpleDateFormat
(
"yyyy-MM-dd"
);
SimpleDateFormat
format
=
new
SimpleDateFormat
(
"yyyy-MM-dd"
);
// @Scheduled(cron = "0
7 15
* * ?")
// @Scheduled(cron = "0
5 11
* * ?")
@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
{
...
@@ -286,7 +286,7 @@ public class LastMonthtimingExport {
...
@@ -286,7 +286,7 @@ public class LastMonthtimingExport {
y
=
y
-
1
;
y
=
y
-
1
;
}
}
if
(
attgro
.
getIsFdjjr
().
equals
(
1
))
{
if
(
attgro
.
getIsFdjjr
().
equals
(
1
11
))
{
if
(
Arrays
.
asList
(
holidays
).
contains
(
String
.
valueOf
(
sdf1
.
format
(
date1
)))){
if
(
Arrays
.
asList
(
holidays
).
contains
(
String
.
valueOf
(
sdf1
.
format
(
date1
)))){
y
=
y
-
1
;
y
=
y
-
1
;
jj
++;
jj
++;
...
@@ -336,7 +336,8 @@ public class LastMonthtimingExport {
...
@@ -336,7 +336,8 @@ public class LastMonthtimingExport {
xxts
=
ClockInTool
.
doChinFilters
(
ClockInTool
.
deleteArrayNull
(
xxts
),
num
);
//为必须上班的话从休息日期中去除
xxts
=
ClockInTool
.
doChinFilters
(
ClockInTool
.
deleteArrayNull
(
xxts
),
num
);
//为必须上班的话从休息日期中去除
}
}
if
(
ClockInTool
.
useArrayUtils
(
appmaps
,
num
))
{
//检查是否存在 无需打卡名单中
if
(
ClockInTool
.
useArrayUtils
(
appmaps
,
num
))
{
//检查是否存在 无需打卡名单中
ycqts
=
ClockInTool
.
doChinFilters
(
ClockInTool
.
deleteArrayNull
(
ycqts
),
num
);
//为必须休息的话从上班日期中去除
ycqts
=
ClockInTool
.
doChinFilters
(
ycqts
,
num
);
//为必须休息的话从上班日期中去除
// ycqts = ClockInTool.doChinFilters(ClockInTool.deleteArrayNull(ycqts), num);//为必须休息的话从上班日期中去除
zjgzts
=
zjgzts
-
1
;
zjgzts
=
zjgzts
-
1
;
String
[]
xxtst
=
new
String
[
xxts
.
length
+
zj
];
String
[]
xxtst
=
new
String
[
xxts
.
length
+
zj
];
...
@@ -349,7 +350,7 @@ public class LastMonthtimingExport {
...
@@ -349,7 +350,7 @@ public class LastMonthtimingExport {
}
}
//当前考勤组开启法定节假日休息开关
//当前考勤组开启法定节假日休息开关
if
(
attgro
.
getIsFdjjr
().
equals
(
1
))
{
if
(
attgro
.
getIsFdjjr
().
equals
(
1
1111
))
{
//法定节假日
//法定节假日
if
(
ClockInTool
.
useArrayUtils
(
holidays
,
num
))
{
//法定节假日沦为休息日计算
if
(
ClockInTool
.
useArrayUtils
(
holidays
,
num
))
{
//法定节假日沦为休息日计算
// ycqts = ClockInTool.doChinFilters(ClockInTool.deleteArrayNull(ycqts), num);//为必须休息的话从上班日期中去除
// ycqts = ClockInTool.doChinFilters(ClockInTool.deleteArrayNull(ycqts), num);//为必须休息的话从上班日期中去除
...
...
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