Joburgess 4 years ago
parent
commit
e08365ef1a

+ 10 - 0
mec-biz/src/main/java/com/ym/mec/biz/dal/dto/TeacherAttendancesDto.java

@@ -50,6 +50,8 @@ public class TeacherAttendancesDto {
     @ApiModelProperty(value = "签退状态(1正常签到,0异常签到) ",required = false)
     private SignOutStatusEnum signOutStatus;
 
+    private String schoolLongitudeLatitude;
+
     private String signInLongitudeLatitude;
 
     private String signOutLongitudeLatitude;
@@ -120,6 +122,14 @@ public class TeacherAttendancesDto {
         this.teacherRole = teacherRole;
     }
 
+    public String getSchoolLongitudeLatitude() {
+        return schoolLongitudeLatitude;
+    }
+
+    public void setSchoolLongitudeLatitude(String schoolLongitudeLatitude) {
+        this.schoolLongitudeLatitude = schoolLongitudeLatitude;
+    }
+
     public String getSignInLongitudeLatitude() {
         return signInLongitudeLatitude;
     }

+ 7 - 0
mec-biz/src/main/java/com/ym/mec/biz/service/impl/CourseScheduleTeacherSalaryServiceImpl.java

@@ -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;