Commit a21becf7 authored by 赵啸非's avatar 赵啸非

修改固定班次考勤

parent 2fe57eed
......@@ -290,8 +290,8 @@ public class FixWorkOtherAttendance extends AttendanceWorkAbstract {
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());
if (!ObjectUtils.isEmpty(recordDetailEntity.getOffWorkDate())) {
errorEntity.setErrorDateTime(recordDetailEntity.getOffWorkDate());
errorEntity.setActualAttendanceDateTime(recordDetailEntity.getOffWorkDate());
} else {
errorEntity.setErrorDateTime(DateUtil.parseDateTime(dateStr + " " + DateUtil.formatTime(offWorkDate)).toJdkDate());
......
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