diff --git a/attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/service/impl/AttendanceRecordHikServiceImpl.java b/attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/service/impl/AttendanceRecordHikServiceImpl.java index eb6b3b3e406901bf38582ac1b881acd3530cd23e..8ab72682ea155434fe9842477d4652889dcd780c 100644 --- a/attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/service/impl/AttendanceRecordHikServiceImpl.java +++ b/attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/service/impl/AttendanceRecordHikServiceImpl.java @@ -159,11 +159,12 @@ public class AttendanceRecordHikServiceImpl extends AbstractCRUDServiceImpl<Atte Map<Long, List<AttendanceLeaveRecordEntity>> leaveRecordGroupMap = attendanceLeaveRecordService.find(leaveRecordQuery).parallelStream().collect(Collectors.groupingBy(x -> x.getLeavePersonId())); */ //鑾峰彇鏃ユ湡 + List<AttendanceRecordEntity> saveList = new ArrayList<>(); + List<AttendanceRecordEntity> updateList = new ArrayList<>(); for (Map.Entry<Long, List<AttendanceRecordHikEntity>> itemEntry : listMap.entrySet()) { //鎸変汉鍛� todo 鏀逛负澶氱嚎绋嬪苟琛岃绠� - List<AttendanceRecordEntity> saveList = new ArrayList<>(); - List<AttendanceRecordEntity> updateList = new ArrayList<>(); + Long staffId = itemEntry.getKey(); List<AttendanceRecordHikEntity> recordHikEntityList = itemEntry.getValue(); Map<String, List<AttendanceRecordHikEntity>> dateRecordMap = recordHikEntityList.stream().collect(Collectors.groupingBy(hikEntity -> DateUtil.formatDate(hikEntity.getAttendanceDate()))); @@ -302,24 +303,23 @@ public class AttendanceRecordHikServiceImpl extends AbstractCRUDServiceImpl<Atte } } } - if (!ObjectUtils.isEmpty(saveList)) { - log.info("鏂板鑰冨嫟璁板綍鏁帮細" + saveList.size()); - attendanceRecordService.save(saveList); + } + if (!ObjectUtils.isEmpty(saveList)) { + log.info("鏂板鑰冨嫟璁板綍鏁帮細" + saveList.size()); + attendanceRecordService.save(saveList); /* for (AttendanceRecordEntity attendanceRecordEntity : saveList) { attendanceRecordService.save(attendanceRecordEntity, context); }*/ - } + } - if (!ObjectUtils.isEmpty(updateList)) { - log.info("鏇存柊鑰冨嫟璁板綍鏁帮細" + updateList.size()); - attendanceRecordService.update(updateList); + if (!ObjectUtils.isEmpty(updateList)) { + log.info("鏇存柊鑰冨嫟璁板綍鏁帮細" + updateList.size()); + attendanceRecordService.update(updateList); /* for (AttendanceRecordEntity attendanceRecordEntity : updateList) { attendanceRecordService.update(attendanceRecordEntity, context); }*/ - } } - }