Bladeren bron

update:课表详情,增加教学点展示

yonge 4 jaren geleden
bovenliggende
commit
ddf3028e17

+ 11 - 0
mec-biz/src/main/java/com/ym/mec/biz/dal/dto/TeacherAttendanceDetailDto.java

@@ -1,6 +1,7 @@
 package com.ym.mec.biz.dal.dto;
 
 import com.ym.mec.biz.dal.entity.CourseSchedule;
+import com.ym.mec.biz.dal.entity.School;
 import com.ym.mec.biz.dal.enums.*;
 
 import java.util.Date;
@@ -31,6 +32,8 @@ public class TeacherAttendanceDetailDto {
     private Date signOutTime;
 
     private Integer attendClassTime;
+    
+    private School school;
 
     public Integer getAttendClassTime() {
         return attendClassTime;
@@ -135,4 +138,12 @@ public class TeacherAttendanceDetailDto {
     public void setSignOutTime(Date signOutTime) {
         this.signOutTime = signOutTime;
     }
+
+	public School getSchool() {
+		return school;
+	}
+
+	public void setSchool(School school) {
+		this.school = school;
+	}
 }

+ 1 - 0
mec-biz/src/main/java/com/ym/mec/biz/service/impl/TeacherAttendanceServiceImpl.java

@@ -631,6 +631,7 @@ public class TeacherAttendanceServiceImpl extends BaseServiceImpl<Long, TeacherA
 		result.setType(courseSchedule.getType());
 		result.setTeacherName(teacherDao.queryNameById(courseSchedule.getActualTeacherId()));
 		result.setAttendClassTime(teacherAttendanceDao.getAttendClassTime(courseScheduleId));
+		result.setSchool(schoolDao.get(courseSchedule.getSchoolId()));
 		if(teacherAttendance != null){
 			result.setIsSignIn(Objects.isNull(teacherAttendance.getSignInStatus())?3:teacherAttendance.getSignInStatus().getCode());
 			result.setIsSignOut(Objects.isNull(teacherAttendance.getSignOutStatus())?3:teacherAttendance.getSignOutStatus().getCode());