Commit 62a5d1d1 authored by 赵啸非's avatar 赵啸非

修改固定班次考勤

parent 583807ac
...@@ -206,7 +206,7 @@ public class FixWorkOtherAttendance extends AttendanceWorkAbstract { ...@@ -206,7 +206,7 @@ public class FixWorkOtherAttendance extends AttendanceWorkAbstract {
} }
} }
if (offInTime) { if (offInTime) {
boolean inTime = DateUtil.isIn(curDateTime, classDetail.getOffWorkDate(), offWorkDateAfter); boolean inTime = DateUtil.isIn(curDateTime, offWorkDateBefore, offWorkDateAfter);
if (inTime) { if (inTime) {
for (AttendanceRecordDetailEntity attendanceRecordDetailEntity : commonData.getDetailEntityList()) { for (AttendanceRecordDetailEntity attendanceRecordDetailEntity : commonData.getDetailEntityList()) {
if (attendanceRecordDetailEntity.getShiftsId() == classDetail.getId()) { if (attendanceRecordDetailEntity.getShiftsId() == classDetail.getId()) {
...@@ -246,8 +246,6 @@ public class FixWorkOtherAttendance extends AttendanceWorkAbstract { ...@@ -246,8 +246,6 @@ public class FixWorkOtherAttendance extends AttendanceWorkAbstract {
//判断上班 //判断上班
AttendanceClassDetailEntity attendanceClassDetailEntity = attendanceClassDetailService.get(recordDetailEntity.getShiftsId()); AttendanceClassDetailEntity attendanceClassDetailEntity = attendanceClassDetailService.get(recordDetailEntity.getShiftsId());
if (ObjectUtils.isEmpty(attendanceClassDetailEntity)) continue; if (ObjectUtils.isEmpty(attendanceClassDetailEntity)) continue;
//判断上班 //判断上班
if (GoWorkResultEnum.正常.getValue() != goWorkResult) { if (GoWorkResultEnum.正常.getValue() != goWorkResult) {
AttendanceRecordErrorEntity errorEntity = new AttendanceRecordErrorEntity(); AttendanceRecordErrorEntity errorEntity = new AttendanceRecordErrorEntity();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment