|
@@ -823,7 +823,7 @@ public class CourseScheduleTeacherSalaryServiceImpl extends BaseServiceImpl<Long
|
|
|
}
|
|
|
Boolean signOutRange = false;
|
|
|
if(teacherAttendance.getSignOutStatus() != null && teacherAttendance.getSignOutStatus() == YesOrNoEnum.YES){
|
|
|
- signInRange = true;
|
|
|
+ signOutRange = true;
|
|
|
}else if(teacherAttendance != null && StringUtils.isNotEmpty(teacherAttendance.getSignOutLongitudeLatitude())){
|
|
|
signOutRange = getSignRange(school.getLongitudeLatitude(),teacherAttendance.getSignOutLongitudeLatitude(),attendanceRange);
|
|
|
}
|
|
@@ -1722,7 +1722,7 @@ public class CourseScheduleTeacherSalaryServiceImpl extends BaseServiceImpl<Long
|
|
|
}
|
|
|
Boolean signOutRange = false;
|
|
|
if(teacherAttendance.getSignOutStatus() != null && teacherAttendance.getSignOutStatus() == YesOrNoEnum.YES){
|
|
|
- signInRange = true;
|
|
|
+ signOutRange = true;
|
|
|
}else if(teacherAttendance != null || StringUtils.isNotEmpty(teacherAttendance.getSignOutLongitudeLatitude())){
|
|
|
signOutRange = getSignRange(school.getLongitudeLatitude(),teacherAttendance.getSignOutLongitudeLatitude(),attendanceRange);
|
|
|
}
|