Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
A
attendance-performance-platform
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
赵啸非
attendance-performance-platform
Commits
7099f031
Commit
7099f031
authored
May 20, 2024
by
廖旭伟
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
考勤汇总时正常考勤增加一条正常明细
parent
61abed36
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
22 additions
and
0 deletions
+22
-0
attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/service/impl/AttendanceStatServiceImpl.java
...le/attendance/service/impl/AttendanceStatServiceImpl.java
+22
-0
No files found.
attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/service/impl/AttendanceStatServiceImpl.java
View file @
7099f031
...
...
@@ -236,6 +236,8 @@ public class AttendanceStatServiceImpl extends AbstractCRUDServiceImpl<Attendanc
log
.
info
(
"考勤人数:"
+
vacationBalanceSummaryVoList
.
size
());
List
<
AttendanceStatEntity
>
insertList
=
new
ArrayList
<>();
List
<
AttendanceStatEntity
>
updateList
=
new
ArrayList
<>();
List
<
AttendanceStaffStatEntity
>
addStaffStat
=
new
ArrayList
<>();
List
<
AttendanceStaffStatEntity
>
updateStaffStat
=
new
ArrayList
<>();
for
(
VacationBalanceSummaryVo
item
:
vacationBalanceSummaryVoList
)
{
if
(
item
.
getStatus
()
==
StaffSatusEnum
.
离职
.
getValue
()){
//离职状态时判断当前汇总日期是否在离职后
...
...
@@ -291,6 +293,20 @@ public class AttendanceStatServiceImpl extends AbstractCRUDServiceImpl<Attendanc
attendanceStatEntity
.
setUpdateTime
(
new
Date
());
updateList
.
add
(
attendanceStatEntity
);
}
AttendanceStaffStatEntity
staffStat
=
new
AttendanceStaffStatEntity
();
staffStat
.
initAttrValue
();
BeanUtils
.
copyProperties
(
item
,
staffStat
,
BeanUtil
.
getNullPropertyNames
(
item
));
staffStat
.
setAttendanceSummary
(
"正常"
);
AttendanceStaffStatEntity
staffStatTemp
=
attendanceStaffStatService
.
selectOne
(
new
AttendanceStaffStatQuery
().
staffId
(
item
.
getStaffId
()).
year
(
item
.
getYear
()).
month
(
item
.
getMonth
()).
day
(
item
.
getDay
()));
if
(
staffStatTemp
!=
null
)
{
staffStat
.
setId
(
staffStatTemp
.
getId
());
staffStat
.
setUpdateTime
(
new
Date
());
updateStaffStat
.
add
(
staffStat
);
}
else
{
staffStat
.
setCreateTime
(
DateUtils
.
StrToDate
(
query
.
getSummaryTime
()));
staffStat
.
setCreateUserId
(
1
l
);
addStaffStat
.
add
(
staffStat
);
}
}
if
(
insertList
.
size
()>
0
){
this
.
dao
.
insertBatch
(
insertList
);
...
...
@@ -298,6 +314,12 @@ public class AttendanceStatServiceImpl extends AbstractCRUDServiceImpl<Attendanc
if
(
updateList
.
size
()>
0
){
this
.
dao
.
updateBatch
(
updateList
);
}
if
(
addStaffStat
.
size
()>
0
){
attendanceStaffStatService
.
save
(
addStaffStat
);
}
if
(
updateStaffStat
.
size
()>
0
){
attendanceStaffStatService
.
update
(
updateStaffStat
);
}
}
log
.
info
(
"完成汇总当前日期假期余额....."
);
...
...
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