|
@@ -186,6 +186,7 @@ public class StudentAttendanceServiceImpl extends BaseServiceImpl<Long, StudentA
|
|
|
|
|
|
//是否在范围内
|
|
|
boolean isInScore = true;
|
|
|
+ String teacherAttendanceMemo = null;
|
|
|
if (Objects.nonNull(school)) {
|
|
|
if (StringUtils.isBlank(school.getLongitudeLatitude())) {
|
|
|
if (studentAttendanceInfos.getUpdate().equals(YesOrNoEnum.YES.getCode())) {
|
|
@@ -193,12 +194,13 @@ public class StudentAttendanceServiceImpl extends BaseServiceImpl<Long, StudentA
|
|
|
schoolDao.update(school);
|
|
|
}
|
|
|
} else {
|
|
|
- SysConfig sysConfig = sysConfigService.findByParamName(SysConfigService.ATTENDANCE_RANGE);
|
|
|
+ SysConfig sysConfig = sysConfigService.findByParamName(SysConfigService.ATTENDANCE_RANGE_VIP);
|
|
|
double attendanceRange = Double.valueOf(sysConfig.getParanValue());
|
|
|
double distance = MapUtil.distance(studentAttendanceInfos.getSignInLongitudeLatitude(),
|
|
|
school.getLongitudeLatitude());
|
|
|
if (distance > attendanceRange) {
|
|
|
isInScore = false;
|
|
|
+ teacherAttendanceMemo = "打卡地点距离教学点" + distance + "米";
|
|
|
}
|
|
|
}
|
|
|
}
|
|
@@ -214,10 +216,11 @@ public class StudentAttendanceServiceImpl extends BaseServiceImpl<Long, StudentA
|
|
|
}
|
|
|
|
|
|
teacherAttendance.setSignInTime(courseSchedule.getStartClassTime());
|
|
|
- teacherAttendance.setSignInStatus(YesOrNoEnum.YES);
|
|
|
+ teacherAttendance.setSignInStatus(isInScore?YesOrNoEnum.YES:YesOrNoEnum.NO);
|
|
|
teacherAttendance.setSignOutTime(courseSchedule.getEndClassTime());
|
|
|
- teacherAttendance.setSignOutStatus(YesOrNoEnum.YES);
|
|
|
+ teacherAttendance.setSignOutStatus(isInScore?YesOrNoEnum.YES:YesOrNoEnum.NO);
|
|
|
teacherAttendance.setCurrentClassTimes(classTimes + 1);
|
|
|
+ teacherAttendance.setRemark(teacherAttendanceMemo);
|
|
|
if (Objects.nonNull(teacherAttendance.getId())) {
|
|
|
teacherAttendanceDao.update(teacherAttendance);
|
|
|
} else {
|