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
7ce227ed
Commit
7ce227ed
authored
4 years ago
by
ilal
Committed by
chenzg
3 years ago
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
提交
parent
3eebc9ec
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
9 additions
and
28 deletions
+9
-28
src/main/java/cn/timer/api/controller/kqgl/ClockInController.java
+9
-28
No files found.
src/main/java/cn/timer/api/controller/kqgl/ClockInController.java
View file @
7ce227ed
...
...
@@ -3032,64 +3032,50 @@ public class ClockInController {
if
(
rul
.
getRulesType
()
!=
null
)
{
if
(
rul
.
getRulesType
()
==
1
)
{
dkjl
.
setCalendar_status_type
(
1
);
ash
.
setCalendar_status_type
(
1
);
}
else
if
(
rul
.
getRulesType
()
==
2
)
{
dkjl
.
setCalendar_status_type
(
2
);
ash
.
setCalendar_status_type
(
2
);
}
else
if
(
rul
.
getRulesType
()
==
3
)
{
dkjl
.
setCalendar_status_type
(
3
);
ash
.
setCalendar_status_type
(
3
);
}
else
if
(
rul
.
getRulesType
()
==
4
)
{
dkjl
.
setCalendar_status_type
(
4
);
ash
.
setCalendar_status_type
(
4
);
}
else
if
(
rul
.
getRulesType
()
==
5
)
{
dkjl
.
setCalendar_status_type
(
5
);
ash
.
setCalendar_status_type
(
5
);
}
else
if
(
rul
.
getRulesType
()
==
6
)
{
dkjl
.
setCalendar_status_type
(
6
);
ash
.
setCalendar_status_type
(
6
);
}
else
if
(
rul
.
getRulesType
()
==
7
)
{
dkjl
.
setCalendar_status_type
(
7
);
ash
.
setCalendar_status_type
(
7
);
}
else
if
(
rul
.
getRulesType
()
==
8
)
{
dkjl
.
setCalendar_status_type
(
8
);
ash
.
setCalendar_status_type
(
8
);
}
else
if
(
rul
.
getRulesType
()
==
9
)
{
dkjl
.
setCalendar_status_type
(
9
);
ash
.
setCalendar_status_type
(
9
);
}
else
if
(
rul
.
getRulesType
()
==
10
)
{
dkjl
.
setCalendar_status_type
(
10
);
ash
.
setCalendar_status_type
(
10
);
}
}
else
{
dkjl
.
setCalendar_status_type
(-
1
);
dkjl
.
setCalendar_status_name
(
rul
.
getName
());
ash
.
setCalendar_status_type
(-
1
);
dkjl
.
setCalendar_status_name
(
rul
.
getName
());
}
}
else
if
(
asssum1
.
getApprovalType
()
==
3
)
{
dkjl
.
setCalendar_status_type
(
12
);
ash
.
setCalendar_status_type
(
12
);
}
else
if
(
asssum1
.
getApprovalType
()
==
4
)
{
dkjl
.
setCalendar_status_type
(
13
);
ash
.
setCalendar_status_type
(
13
);
}
}
else
{
dkjl
.
setCalendar_status_type
(
0
);
ash
.
setCalendar_status_type
(
0
);
}
/****/
...
...
@@ -3310,10 +3296,14 @@ public class ClockInController {
}
//没有打卡按钮时
for
(
int
y
=
0
;
y
<
bc
;
y
++)
{
AttSchedule
attc
=
attsch
.
get
(
y
);
if
(
attc
.
getDajl
().
getCardType
()
==
null
&&
attc
.
getDajl
().
getId
()
==
null
&&
attc
.
getDajl
().
getStatus
()
==
null
)
{
attc
.
setIsdk
(
0
);
break
;
}
}
}
}
else
{
...
...
@@ -3327,15 +3317,10 @@ public class ClockInController {
//自由工时
List
<
AttSchedule
>
attsch
=
new
ArrayList
<
AttSchedule
>();
// List<KqglAssoDkjl> dajllist_ = kqglassodkjlmapper.getDetailedRecordClock(startDate,endDate,userBean.getEmpNum());
// KqglAssoDkjl dkjl = KqglAssoDkjl.builder().build();
if
(
dajllist_
.
size
()
>
0
)
{
for
(
int
i
=
1
;
i
<=
dajllist_
.
size
();
i
++){
KqglAssoDkjl
dkjl
=
KqglAssoDkjl
.
builder
().
build
();
// for(KqglAssoDkjl ddk : dajllist_) {
BeanUtil
.
copyProperties
(
dajllist_
.
get
(
i
-
1
),
dkjl
,
"attdate"
,
"bcid"
,
"remarks"
,
"userId"
,
"attime"
,
"dkmxid"
,
"commentary"
,
"punchequipment"
,
"punchmode"
);
// }
BeanUtil
.
copyProperties
(
dajllist_
.
get
(
i
-
1
),
dkjl
,
"attdate"
,
"bcid"
,
"remarks"
,
"userId"
,
"attime"
,
"dkmxid"
,
"commentary"
,
"punchequipment"
,
"punchmode"
);
AttSchedule
ast
=
AttSchedule
.
builder
().
build
();
ast
.
setId
(
0
);
ast
.
setIsdk
(
1
);
...
...
@@ -3344,8 +3329,6 @@ public class ClockInController {
attsch
.
add
(
ast
);
attdate
.
setAttsch
(
attsch
);
}
KqglAssoDkjl
dkjj_
=
KqglAssoDkjl
.
builder
().
build
();
AttSchedule
ast_
=
AttSchedule
.
builder
().
build
();
ast_
.
setId
(
0
);
...
...
@@ -3354,8 +3337,6 @@ public class ClockInController {
ast_
.
setSort
(
dajllist_
.
size
()
+
1
);
attsch
.
add
(
ast_
);
attdate
.
setAttsch
(
attsch
);
}
else
{
KqglAssoDkjl
dkjj
=
KqglAssoDkjl
.
builder
().
build
();
AttSchedule
ast
=
AttSchedule
.
builder
().
build
();
...
...
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