修改固定班次考勤

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

@@ -246,6 +246,10 @@ public class FixWorkOtherAttendance extends AttendanceWorkAbstract {
             //判断上班
             AttendanceClassDetailEntity attendanceClassDetailEntity = attendanceClassDetailService.get(recordDetailEntity.getShiftsId());
             if (ObjectUtils.isEmpty(attendanceClassDetailEntity)) continue;
+
+
+            //判断上班
+            if (GoWorkResultEnum.正常.getValue() != goWorkResult) {
                 AttendanceRecordErrorEntity errorEntity = new AttendanceRecordErrorEntity();
                 errorEntity.initAttrValue();
                 BeanUtils.copyProperties(attendanceRecordEntity, errorEntity, new String[]{"id"});
@@ -255,9 +259,6 @@ public class FixWorkOtherAttendance extends AttendanceWorkAbstract {
                 errorEntity.setProcessStatus(YesNoEnum.NO.getValue());
                 errorEntity.setCreateTime(new Date());
                 errorEntity.setCreateUserId(context.getUser().getId());
-
-            //判断上班
-            if (GoWorkResultEnum.正常.getValue() != goWorkResult) {
                 Date goWorkDate = attendanceClassDetailEntity.getGoWorkDate();
                 errorEntity.setGoOffDateTime(DateUtil.parseDateTime(dateStr + " " + DateUtil.formatTime(goWorkDate)).toJdkDate());
                 if (!ObjectUtils.isEmpty(recordDetailEntity.getGoWorkDate())) {
@@ -266,7 +267,6 @@ public class FixWorkOtherAttendance extends AttendanceWorkAbstract {
                 } else {
                     errorEntity.setErrorDateTime(DateUtil.parseDateTime(dateStr + " " + DateUtil.formatTime(goWorkDate)).toJdkDate());
                 }
-
                 if (GoWorkResultEnum.早退.getValue() == recordDetailEntity.getGoWorkResult()) {
                     errorEntity.setErrorStatus(ErrorStatusEnum.早退.getValue());
                 }
@@ -276,16 +276,23 @@ public class FixWorkOtherAttendance extends AttendanceWorkAbstract {
                 if (GoWorkResultEnum.缺卡.getValue() == recordDetailEntity.getGoWorkResult()) {
                     errorEntity.setErrorStatus(ErrorStatusEnum.缺卡.getValue());
                 }
-
                 errorEntityList.add(errorEntity);
             }
             //判断下班
             if (OffWorkResultEnum.正常.getValue() != offWorkResult) {
+                AttendanceRecordErrorEntity errorEntity = new AttendanceRecordErrorEntity();
+                errorEntity.initAttrValue();
+                BeanUtils.copyProperties(attendanceRecordEntity, errorEntity, new String[]{"id"});
+                errorEntity.setShiftsId(recordDetailEntity.getShiftsId());
+                errorEntity.setShiftsName(recordDetailEntity.getShiftsName());
+                errorEntity.setProcessStatus(YesNoEnum.NO.getValue());
+                errorEntity.setCreateTime(new Date());
+                errorEntity.setCreateUserId(context.getUser().getId());
                 Date offWorkDate = attendanceClassDetailEntity.getOffWorkDate();
                 errorEntity.setGoOffDateTime(DateUtil.parseDateTime(dateStr + " " + DateUtil.formatTime(offWorkDate)).toJdkDate());
                 if (!ObjectUtils.isEmpty(recordDetailEntity.getGoWorkDate())) {
                     errorEntity.setErrorDateTime(recordDetailEntity.getGoWorkDate());
-                    errorEntity.setActualAttendanceDateTime(recordDetailEntity.getGoWorkDate());
+                    errorEntity.setActualAttendanceDateTime(recordDetailEntity.getOffWorkDate());
                 } else {
                     errorEntity.setErrorDateTime(DateUtil.parseDateTime(dateStr + " " + DateUtil.formatTime(offWorkDate)).toJdkDate());
                 }