|
@@ -1297,9 +1297,9 @@ public class CourseScheduleTeacherSalaryServiceImpl extends BaseServiceImpl<Long
|
|
|
if(idTeacherAttendanceMap.containsKey(t.getTeacherId())){
|
|
|
TeacherAttendance teacherAttendance = idTeacherAttendanceMap.get(t.getTeacherId());
|
|
|
t.setSignInTime(teacherAttendance.getSignInTime());
|
|
|
- t.setSignInStatus(Objects.nonNull(teacherAttendance.getSignInStatus())?SignInStatusEnum.valueOf(teacherAttendance.getSignInStatus().getCode().toString()):SignInStatusEnum.NO);
|
|
|
+ t.setSignInStatus(Objects.nonNull(teacherAttendance.getSignInStatus())?(YesOrNoEnum.NO.equals(teacherAttendance.getSignInStatus())?SignInStatusEnum.UNUSUAL:SignInStatusEnum.NORMAL):SignInStatusEnum.NO);
|
|
|
t.setSignOutTime(teacherAttendance.getSignOutTime());
|
|
|
- t.setSignOutStatus(Objects.nonNull(teacherAttendance.getSignOutStatus())?SignOutStatusEnum.valueOf(teacherAttendance.getSignOutStatus().getCode().toString()):SignOutStatusEnum.NO);
|
|
|
+ t.setSignOutStatus(Objects.nonNull(teacherAttendance.getSignOutStatus())?(YesOrNoEnum.NO.equals(teacherAttendance.getSignOutStatus())?SignOutStatusEnum.UNUSUAL:SignOutStatusEnum.NORMAL):SignOutStatusEnum.NO);
|
|
|
t.setSignInLongitudeLatitude(teacherAttendance.getSignInLongitudeLatitude());
|
|
|
t.setSignOutLongitudeLatitude(teacherAttendance.getSignOutLongitudeLatitude());
|
|
|
}
|