|
@@ -69,6 +69,8 @@ public class TeacherAttendanceServiceImpl extends BaseServiceImpl<Long, TeacherA
|
|
|
throw new BizException("请选择课程!");
|
|
|
}
|
|
|
|
|
|
+ ClassGroup classGroup = new ClassGroup();
|
|
|
+
|
|
|
// SysConfig byParamName = sysConfigService.findByParamName(SysConfigService.ADVANCE_SIGN_IN_MINUTES);
|
|
|
// Integer advanceSignInMinutes=Integer.parseInt(byParamName.getParanValue());
|
|
|
|
|
@@ -92,6 +94,7 @@ public class TeacherAttendanceServiceImpl extends BaseServiceImpl<Long, TeacherA
|
|
|
|
|
|
teacherAttendance.setMusicGroupId(currentCourseDetail.getMusicGroupId());
|
|
|
teacherAttendance.setClassGroupId(currentCourseDetail.getClassId());
|
|
|
+ teacherAttendance.setGroupType(classGroup.getGroupType());
|
|
|
teacherAttendance.setRemark(teacherSignOutDto.getTeacherAttendanceInfo().getRemark());
|
|
|
int advanceSignMinutes = Integer.parseInt(sysConfigDao.findConfigValue(SysConfigService.ADVANCE_SIGN_IN_MINUTES));
|
|
|
|
|
@@ -162,7 +165,6 @@ public class TeacherAttendanceServiceImpl extends BaseServiceImpl<Long, TeacherA
|
|
|
teacherAttendanceDao.insert(teacherAttendance);
|
|
|
}
|
|
|
//修改当前课时
|
|
|
- ClassGroup classGroup = new ClassGroup();
|
|
|
classGroup.setId(teacherAttendance.getClassGroupId());
|
|
|
classGroup.setCurrentClassTimes(teacherAttendance.getCurrentClassTimes() + 1);
|
|
|
classGroup.setUpdateTime(date);
|
|
@@ -171,6 +173,7 @@ public class TeacherAttendanceServiceImpl extends BaseServiceImpl<Long, TeacherA
|
|
|
CourseHomework courseHomework=teacherSignOutDto.getCourseHomeworkInfo();
|
|
|
courseHomework.setCourseScheduleId(teacherAttendance.getCourseScheduleId());
|
|
|
courseHomework.setMusicGroupId(currentCourseDetail.getMusicGroupId());
|
|
|
+ courseHomework.setGroupType(classGroup.getGroupType());
|
|
|
courseHomework.setClassGroupId(currentCourseDetail.getClassId().intValue());
|
|
|
courseHomework.setExpectNum(studentAttendanceDao.countNormalAttendanceStudentNums(teacherAttendance.getCourseScheduleId()));
|
|
|
CourseSchedule nextCourseSchedule = courseScheduleDao.getNextCourseSchedule(classGroup.getId());
|
|
@@ -206,7 +209,6 @@ public class TeacherAttendanceServiceImpl extends BaseServiceImpl<Long, TeacherA
|
|
|
teacherAttendance=new TeacherAttendance();
|
|
|
teacherAttendance.setGroupType(courseSchedule.getGroupType());
|
|
|
teacherAttendance.setCourseScheduleId(courseScheduleId.longValue());
|
|
|
- teacherAttendance.setCurrentClassTimes(classGroup.getCurrentClassTimes());
|
|
|
teacherAttendance.setTeacherId(userId);
|
|
|
teacherAttendance.setMusicGroupId(classGroup.getMusicGroupId());
|
|
|
teacherAttendance.setClassGroupId(classGroup.getId());
|
|
@@ -274,6 +276,7 @@ public class TeacherAttendanceServiceImpl extends BaseServiceImpl<Long, TeacherA
|
|
|
}else {
|
|
|
throw new BizException("签退时间异常");
|
|
|
}
|
|
|
+ teacherAttendance.setCurrentClassTimes(classGroup.getCurrentClassTimes() + 1);
|
|
|
teacherAttendance.setSignOutTime(date);
|
|
|
teacherAttendanceDao.update(teacherAttendance);
|
|
|
//教师签退后,给未签到学员添加旷课记录
|