Merge remote-tracking branch 'origin/master'

mec-biz/src/main/java/com/ym/mec/biz/service/impl/StudentAttendanceServiceImpl.java

@@ -463,6 +463,7 @@ public class StudentAttendanceServiceImpl extends BaseServiceImpl<Long, StudentA
 			studentAttendance.setMusicGroupId(classGroup.getMusicGroupId());
 			studentAttendance.setUserId(userId);
 			studentAttendance.setTeacherId(courseSchedule.getActualTeacherId());
+
 			studentAttendanceDao.insert(studentAttendance);
 		}else {
 			studentAttendance.setTeacherId(courseSchedule.getActualTeacherId());
@@ -573,6 +574,9 @@ public class StudentAttendanceServiceImpl extends BaseServiceImpl<Long, StudentA
 							}
 						}
 					}
+				}else {
+					studentAttendance.setStatus(statusEnum);
+					studentAttendance.setSignOutTime(date);
 				}
 				if(studentAttendance.getSignOutTime() == null){
 					studentAttendance.setStatus(statusEnum);

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

@@ -374,6 +374,9 @@ public class TeacherAttendanceServiceImpl extends BaseServiceImpl<Long, TeacherA
 							}
 						}
 					}
+				}else {
+					teacherAttendance.setSignOutStatus(YesOrNoEnum.YES);
+					teacherAttendance.setSignOutTime(date);
 				}
 				if(teacherAttendance.getSignOutTime() == null){
 					teacherAttendance.setSignOutStatus(YesOrNoEnum.YES);