|
@@ -1289,6 +1289,10 @@ public class CourseScheduleTeacherSalaryServiceImpl extends BaseServiceImpl<Long
|
|
|
usersSimpleInfo = teacherDao.getUsersSimpleInfo(new ArrayList<>(teacherIds));
|
|
|
}
|
|
|
Map<Integer, SimpleUserDto> idUserMap = usersSimpleInfo.stream().collect(Collectors.toMap(SimpleUserDto::getUserId, s -> s));
|
|
|
+
|
|
|
+ CourseSchedule courseSchedule = courseScheduleDao.get(courseScheduleId);
|
|
|
+ School school = schoolService.get(courseSchedule.getSchoolId());
|
|
|
+
|
|
|
for (CourseScheduleTeacherSalary courseScheduleTeacherSalary : courseScheduleTeacherSalaries) {
|
|
|
TeacherAttendancesDto t = new TeacherAttendancesDto();
|
|
|
t.setTeacherId(courseScheduleTeacherSalary.getUserId());
|
|
@@ -1303,6 +1307,9 @@ public class CourseScheduleTeacherSalaryServiceImpl extends BaseServiceImpl<Long
|
|
|
t.setSignInLongitudeLatitude(teacherAttendance.getSignInLongitudeLatitude());
|
|
|
t.setSignOutLongitudeLatitude(teacherAttendance.getSignOutLongitudeLatitude());
|
|
|
}
|
|
|
+ if(Objects.nonNull(school)){
|
|
|
+ t.setSchoolLongitudeLatitude(school.getLongitudeLatitude());
|
|
|
+ }
|
|
|
result.add(t);
|
|
|
}
|
|
|
return result;
|