修改用户等

attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/service/work/FixWorkOtherAttendance.java

@@ -264,6 +264,7 @@ public class FixWorkOtherAttendance extends AttendanceWorkAbstract {
     public void genErrorAttendRecord(Context context, String dateStr, AttendanceRecordEntity attendanceRecordEntity, List<AttendanceRecordDetailEntity> detailEntityList) {
         //处理异常打卡，所以异常打卡的 都新增一条记录
         List<AttendanceRecordErrorEntity> errorEntityList = new ArrayList<>();
+        List<AttendanceRecordErrorEntity> errorSwitchNormalList = new ArrayList<>();
         for (AttendanceRecordDetailEntity recordDetailEntity : detailEntityList) {
             Integer goWorkResult = recordDetailEntity.getGoWorkResult();
             Integer offWorkResult = recordDetailEntity.getOffWorkResult();
@@ -331,14 +332,24 @@ public class FixWorkOtherAttendance extends AttendanceWorkAbstract {
                 }
                 errorEntityList.add(errorEntity);
             }
+
+//
+//            if(GoWorkResultEnum.正常.getValue() == goWorkResult&&OffWorkResultEnum.正常.getValue() == offWorkResult){
+////将异常的记录删除
+//                AttendanceRecordErrorEntity errorEntity = new AttendanceRecordErrorEntity();
+//                errorEntity.initAttrValue();
+//                BeanUtils.copyProperties(attendanceRecordEntity, errorEntity, new String[]{"id"});
+//
+//                errorSwitchNormalList.add(errorEntity);
+//            }
+
         }
 
         if (!ObjectUtils.isEmpty(errorEntityList)) {
-
             //删除当前员工当日未处理的异常后，重新添加
             AttendanceRecordErrorQuery errorQuery = new AttendanceRecordErrorQuery();
-            errorQuery.setCreateTimeStart(DateUtil.today());
-            errorQuery.setCreateTimeEnd(DateUtil.today());
+            errorQuery.setCreateTimeStart(dateStr);
+            errorQuery.setCreateTimeEnd(dateStr);
             errorQuery.setStaffId(attendanceRecordEntity.getStaffId());
             errorQuery.setProcessStatus(YesNoEnum.NO.getValue());
 
@@ -366,5 +377,10 @@ public class FixWorkOtherAttendance extends AttendanceWorkAbstract {
                 }
             }
         }
+
+
+        if (!ObjectUtils.isEmpty(errorSwitchNormalList)) {
+            //删除异常记录
+        }
     }
 }