修改假期重复提交的问题

attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/service/impl/AttendanceRecordHikServiceImpl.java

@@ -114,6 +114,9 @@ public class AttendanceRecordHikServiceImpl extends AbstractCRUDServiceImpl<Atte
                 }
                 //通过员工id查询考勤组人员信息
                 List<AttendanceGroupStaffEntity> attendanceGroupStaffEntities = attendanceGroupStaffService.find(new AttendanceGroupStaffQuery().staffId(staffId));
+                //过滤重复考勤组与人员
+                attendanceGroupStaffEntities = attendanceGroupStaffEntities.stream().collect(Collectors.toMap(x -> x.getGroupId() + "#" + x.getStaffId(), y -> y, (o, n) -> n)).values().stream().collect(Collectors.toList());
+
                 List<AttendanceRecordDetailEntity> detailEntityList = new ArrayList<>();
                 if (!ObjectUtils.isEmpty(attendanceGroupStaffEntities) && attendanceGroupStaffEntities.size() == 1) {
                     //checkAttendGroupByOne(attendanceRecordEntity, detailEntityList, attendanceDate, attendanceGroupStaffEntities.get(0), context);
@@ -137,6 +140,7 @@ public class AttendanceRecordHikServiceImpl extends AbstractCRUDServiceImpl<Atte
                 //如果考勤人员信息list长度大于1 则该考勤人员有多个考勤组.
                 if (StringUtils.isNotNull(attendanceGroupStaffEntities) && attendanceGroupStaffEntities.size() > 1) {
                     for (AttendanceGroupStaffEntity groupStaffEntity : attendanceGroupStaffEntities) {
+                        detailEntityList = new ArrayList<>();
                         //多考勤组 todo 暂时和单一覆盖
                         //checkAttendGroupByOne(attendanceRecordEntity, detailEntityList, attendanceDate, groupStaffEntity, context);
                         //查询考勤组
@@ -185,8 +189,8 @@ public class AttendanceRecordHikServiceImpl extends AbstractCRUDServiceImpl<Atte
                     //判断是否存在记录 如果存在 则更新  维度   staffId  attendanceDate shiftsId attendanceGroupId
                     AttendanceRecordQuery query = new AttendanceRecordQuery();
                     query.setStaffId(attendanceRecordEntity.getStaffId());
-                   // query.setClassId(attendanceRecordEntity.getClassId());
-                   // query.setAttendanceGroupId(attendanceRecordEntity.getAttendanceGroupId());
+                    // query.setClassId(attendanceRecordEntity.getClassId());
+                    // query.setAttendanceGroupId(attendanceRecordEntity.getAttendanceGroupId());
                     query.setAttendanceDate(attendanceRecordEntity.getAttendanceDate());
 
                     AttendanceRecordEntity recordEntity = attendanceRecordService.selectOne(query);
@@ -225,7 +229,7 @@ public class AttendanceRecordHikServiceImpl extends AbstractCRUDServiceImpl<Atte
                 AttendanceRecordEntity attendanceRecordEntity = new AttendanceRecordEntity();
                 attendanceRecordEntity.initAttrValue();
                 //分日期 遍历考勤记录 考勤记录一天只生成一条 详细多条
-                List<AttendanceRecordDetailEntity> detailEntityList =null;
+                List<AttendanceRecordDetailEntity> detailEntityList = null;
                 for (AttendanceRecordHikEntity item : attendanceRecordHikEntities) {
                     detailEntityList = new ArrayList<>();
                     //对主表的对象进行赋值
@@ -413,7 +417,6 @@ public class AttendanceRecordHikServiceImpl extends AbstractCRUDServiceImpl<Atte
                 }
 
 
-
                 errorEntityList.add(errorEntity);
             }
 
@@ -427,10 +430,9 @@ public class AttendanceRecordHikServiceImpl extends AbstractCRUDServiceImpl<Atte
     }
 
 
-
-    private Boolean checkDouble(List<AttendanceRecordErrorEntity> errorEntityList,AttendanceRecordErrorEntity checkError){
+    private Boolean checkDouble(List<AttendanceRecordErrorEntity> errorEntityList, AttendanceRecordErrorEntity checkError) {
         //检测 新加 的错误 是否存在与列表中
-        boolean bool=true;
+        boolean bool = true;
         for (AttendanceRecordErrorEntity error : errorEntityList) {
 
             //
@@ -441,8 +443,6 @@ public class AttendanceRecordHikServiceImpl extends AbstractCRUDServiceImpl<Atte
         }
 
 
-
-
         return bool;
     }