Merge remote-tracking branch 'origin/master'

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

@@ -206,7 +206,7 @@ public class FixWorkOtherAttendance extends AttendanceWorkAbstract {
                         }
                     }
                     if (offInTime) {
-                        boolean inTime = DateUtil.isIn(curDateTime, classDetail.getOffWorkDate(), offWorkDateAfter);
+                        boolean inTime = DateUtil.isIn(curDateTime, offWorkDateBefore, offWorkDateAfter);
                         if (inTime) {
                             for (AttendanceRecordDetailEntity attendanceRecordDetailEntity : commonData.getDetailEntityList()) {
                                 if (attendanceRecordDetailEntity.getShiftsId() == classDetail.getId()) {
@@ -246,8 +246,6 @@ public class FixWorkOtherAttendance extends AttendanceWorkAbstract {
             //判断上班
             AttendanceClassDetailEntity attendanceClassDetailEntity = attendanceClassDetailService.get(recordDetailEntity.getShiftsId());
             if (ObjectUtils.isEmpty(attendanceClassDetailEntity)) continue;
-
-
             //判断上班
             if (GoWorkResultEnum.正常.getValue() != goWorkResult) {
                 AttendanceRecordErrorEntity errorEntity = new AttendanceRecordErrorEntity();