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
fae33e2a
Commit
fae33e2a
authored
4 years ago
by
youling
Committed by
chenzg
3 years ago
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
定时器
parent
7f0ceef5
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
4 deletions
+3
-4
src/main/java/cn/timer/api/controller/kqgl/atttimer/AttendanceTaskTiming.java
+3
-4
No files found.
src/main/java/cn/timer/api/controller/kqgl/atttimer/AttendanceTaskTiming.java
View file @
fae33e2a
...
@@ -233,7 +233,7 @@ public class AttendanceTaskTiming{
...
@@ -233,7 +233,7 @@ public class AttendanceTaskTiming{
if
(
attgro
.
getPbfs
()
==
1
){
//固定排班
if
(
attgro
.
getPbfs
()
==
1
){
//固定排班
List
<
KqglAssoTeshu
>
bxdklist
=
kqglassoteshumapper
.
ShouldSpecialDatessetByKqzid
(
attgro
.
getId
(),
ttstr
,
1
);
//当前月 必须打卡日期
List
<
KqglAssoTeshu
>
bxdklist
=
kqglassoteshumapper
.
ShouldSpecialDatessetByKqzid
(
attgro
.
getId
(),
ttstr
,
1
);
//当前月 必须打卡日期
int
bxdk
=
bxdklist
.
size
();
int
bxdk
=
bxdklist
.
size
();
log
.
error
(
"bxdk数据为:"
+
bxdk
);
String
[]
bxdkss
=
new
String
[
bxdk
];
////特殊-必须打卡天数(工作日)
String
[]
bxdkss
=
new
String
[
bxdk
];
////特殊-必须打卡天数(工作日)
int
b
=
0
;
int
b
=
0
;
for
(
KqglAssoTeshu
bxd
:
bxdklist
)
{
for
(
KqglAssoTeshu
bxd
:
bxdklist
)
{
...
@@ -272,7 +272,7 @@ public class AttendanceTaskTiming{
...
@@ -272,7 +272,7 @@ public class AttendanceTaskTiming{
int
y
=
0
,
q
=
0
,
jj
=
0
,
xx
=
0
;
//jj:节假日
int
y
=
0
,
q
=
0
,
jj
=
0
,
xx
=
0
;
//jj:节假日
String
[]
zdxx
=
new
String
[
31
];
//法定休息的具体天数(yyyy-MM-dd)
String
[]
zdxx
=
new
String
[
31
];
//法定休息的具体天数(yyyy-MM-dd)
int
wd
=
ClockInTool
.
getDaysByYearMonth
(
year
,
month
);
int
wd
=
ClockInTool
.
getDaysByYearMonth
(
year
,
month
);
log
.
error
(
"ClockInTool:"
+
wd
);
for
(
int
i
=
1
;
i
<=
wd
;
i
++){
for
(
int
i
=
1
;
i
<=
wd
;
i
++){
boolean
xixi
=
true
;
boolean
xixi
=
true
;
...
@@ -280,12 +280,11 @@ public class AttendanceTaskTiming{
...
@@ -280,12 +280,11 @@ public class AttendanceTaskTiming{
for
(
int
u
=
0
;
u
<
week
.
length
;
u
++){
for
(
int
u
=
0
;
u
<
week
.
length
;
u
++){
String
webbuf
=
sdf2
.
format
(
date1
);
String
webbuf
=
sdf2
.
format
(
date1
);
log
.
error
(
"webbuf:"
+
webbuf
+
" week[u]:"
+
week
[
u
]);
if
(
webbuf
.
equals
(
week
[
u
])){
if
(
webbuf
.
equals
(
week
[
u
])){
q
++;
q
++;
y
++;
y
++;
log
.
error
(
"appmaps: "
+
appmaps
.
toString
());
if
(
Arrays
.
asList
(
appmaps
).
contains
(
String
.
valueOf
(
sdf1
.
format
(
date1
)))){
if
(
Arrays
.
asList
(
appmaps
).
contains
(
String
.
valueOf
(
sdf1
.
format
(
date1
)))){
y
=
y
-
1
;
y
=
y
-
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