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
456617d8
Commit
456617d8
authored
Oct 30, 2024
by
赵啸非
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
恢复级联删除考勤异常与考勤绩效
parent
0ae0e771
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
5 deletions
+5
-5
attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/service/impl/AttendanceRecordHikServiceImpl.java
...tendance/service/impl/AttendanceRecordHikServiceImpl.java
+4
-4
attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/service/work/FixWorkOtherAttendance.java
...odule/attendance/service/work/FixWorkOtherAttendance.java
+1
-1
No files found.
attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/service/impl/AttendanceRecordHikServiceImpl.java
View file @
456617d8
...
@@ -112,11 +112,11 @@ public class AttendanceRecordHikServiceImpl extends AbstractCRUDServiceImpl<Atte
...
@@ -112,11 +112,11 @@ public class AttendanceRecordHikServiceImpl extends AbstractCRUDServiceImpl<Atte
Map
<
Long
,
List
<
AttendanceGroupFixedworkSpecialEntity
>>
fixedSpecialGroupMap
=
specialService
.
find
(
new
AttendanceGroupFixedworkSpecialEntity
()).
parallelStream
().
collect
(
Collectors
.
groupingBy
(
x
->
x
.
getFixedWorkId
()));
Map
<
Long
,
List
<
AttendanceGroupFixedworkSpecialEntity
>>
fixedSpecialGroupMap
=
specialService
.
find
(
new
AttendanceGroupFixedworkSpecialEntity
()).
parallelStream
().
collect
(
Collectors
.
groupingBy
(
x
->
x
.
getFixedWorkId
()));
//获取当日未处理异常记录
//获取当日未处理异常记录
AttendanceRecordErrorQuery
attendanceRecordErrorQuery
=
new
AttendanceRecordErrorQuery
();
/*
AttendanceRecordErrorQuery attendanceRecordErrorQuery = new AttendanceRecordErrorQuery();
attendanceRecordErrorQuery.setErrorDateTimeStart(attendanceRecordHikQuery.getAttendanceDateStart());
attendanceRecordErrorQuery.setErrorDateTimeStart(attendanceRecordHikQuery.getAttendanceDateStart());
attendanceRecordErrorQuery.setErrorDateTimeEnd(attendanceRecordErrorQuery.getActualAttendanceDateTimeEnd());
attendanceRecordErrorQuery.setErrorDateTimeEnd(attendanceRecordErrorQuery.getActualAttendanceDateTimeEnd());
Map<Long, List<AttendanceRecordErrorEntity>> errorGroupStaffMap = errorService.find(attendanceRecordErrorQuery).parallelStream().collect(Collectors.groupingBy(x -> x.getStaffId()));
Map<Long, List<AttendanceRecordErrorEntity>> errorGroupStaffMap = errorService.find(attendanceRecordErrorQuery).parallelStream().collect(Collectors.groupingBy(x -> x.getStaffId()));
*/
String
attendanceDateStart
=
attendanceRecordHikQuery
.
getAttendanceDateStart
();
String
attendanceDateStart
=
attendanceRecordHikQuery
.
getAttendanceDateStart
();
String
attendanceDateEnd
=
attendanceRecordHikQuery
.
getAttendanceDateEnd
();
String
attendanceDateEnd
=
attendanceRecordHikQuery
.
getAttendanceDateEnd
();
...
@@ -186,7 +186,7 @@ public class AttendanceRecordHikServiceImpl extends AbstractCRUDServiceImpl<Atte
...
@@ -186,7 +186,7 @@ public class AttendanceRecordHikServiceImpl extends AbstractCRUDServiceImpl<Atte
commonData
.
setRecordHikEntities
(
recordHikEntities
);
commonData
.
setRecordHikEntities
(
recordHikEntities
);
commonData
.
setFixedSpecialGroupMap
(
fixedSpecialGroupMap
);
commonData
.
setFixedSpecialGroupMap
(
fixedSpecialGroupMap
);
commonData
.
setClassDetailEntityMap
(
classDetailEntityMap
);
commonData
.
setClassDetailEntityMap
(
classDetailEntityMap
);
commonData
.
setErrorGroupStaffMap
(
errorGroupStaffMap
);
//
commonData.setErrorGroupStaffMap(errorGroupStaffMap);
workAbstract
.
doHandleWork
(
commonData
);
workAbstract
.
doHandleWork
(
commonData
);
}
}
//如果考勤人员信息list长度大于1 则该考勤人员有多个考勤组.
//如果考勤人员信息list长度大于1 则该考勤人员有多个考勤组.
...
@@ -212,7 +212,7 @@ public class AttendanceRecordHikServiceImpl extends AbstractCRUDServiceImpl<Atte
...
@@ -212,7 +212,7 @@ public class AttendanceRecordHikServiceImpl extends AbstractCRUDServiceImpl<Atte
commonData
.
setRecordHikEntities
(
recordHikEntities
);
commonData
.
setRecordHikEntities
(
recordHikEntities
);
commonData
.
setFixedSpecialGroupMap
(
fixedSpecialGroupMap
);
commonData
.
setFixedSpecialGroupMap
(
fixedSpecialGroupMap
);
commonData
.
setClassDetailEntityMap
(
classDetailEntityMap
);
commonData
.
setClassDetailEntityMap
(
classDetailEntityMap
);
commonData
.
setErrorGroupStaffMap
(
errorGroupStaffMap
);
//
commonData.setErrorGroupStaffMap(errorGroupStaffMap);
workAbstract
.
doHandleWork
(
commonData
);
workAbstract
.
doHandleWork
(
commonData
);
}
}
}
}
...
...
attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/service/work/FixWorkOtherAttendance.java
View file @
456617d8
...
@@ -463,7 +463,7 @@ public class FixWorkOtherAttendance extends AttendanceWorkAbstract {
...
@@ -463,7 +463,7 @@ public class FixWorkOtherAttendance extends AttendanceWorkAbstract {
errorEntityList
=
errorEntityList
.
stream
().
distinct
().
collect
(
Collectors
.
toList
());
errorEntityList
=
errorEntityList
.
stream
().
distinct
().
collect
(
Collectors
.
toList
());
for
(
AttendanceRecordErrorEntity
errorEntity
:
errorEntityList
)
{
for
(
AttendanceRecordErrorEntity
errorEntity
:
errorEntityList
)
{
//查看是否存在相同的异常记录,如果存在 则不添加 todo 非数据库查询方式判断优化
//查看是否存在相同的异常记录,如果存在 则不添加 todo 非数据库查询方式判断优化
List
<
AttendanceRecordErrorEntity
>
attendanceRecordErrorEntities
=
commonData
.
getErrorGroupStaffMap
().
getOrDefault
(
attendanceRecordEntity
.
getStaffId
(),
new
ArrayList
<>(
0
));
//
List<AttendanceRecordErrorEntity> attendanceRecordErrorEntities = commonData.getErrorGroupStaffMap().getOrDefault(attendanceRecordEntity.getStaffId(), new ArrayList<>(0));
// checkAndSaveCache(context, attendanceRecordErrorEntities, errorEntity);
// checkAndSaveCache(context, attendanceRecordErrorEntities, errorEntity);
checkAndSave
(
context
,
errorEntity
);
checkAndSave
(
context
,
errorEntity
);
}
}
...
...
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