zouxuan 5 anos atrás
pai
commit
a4155164e8

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

@@ -16,6 +16,8 @@ public class CourseScheduleEndDto extends CourseSchedule {
 
     private String organName;
 
+    private String remark;
+
     private int isSignIn;
 
     private int isSignOut;
@@ -26,6 +28,14 @@ public class CourseScheduleEndDto extends CourseSchedule {
 
     private Date signOutTime;
 
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+
     public Date getSignInTime() {
         return signInTime;
     }

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

@@ -2335,6 +2335,7 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
                     result.setIsSignOut(Objects.isNull(teacherAttendance.getSignOutStatus())?3:teacherAttendance.getSignOutStatus().getCode());
                     result.setSignInTime(teacherAttendance.getSignInTime());
                     result.setSignOutTime(teacherAttendance.getSignOutTime());
+                    result.setRemark(teacherAttendance.getRemark());
                 }
                 Long studentNum = studentNumCourseMap.get(result.getId());
                 if (Objects.nonNull(studentNum)) {