|
@@ -69,7 +69,6 @@ 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());
|
|
@@ -94,7 +93,7 @@ public class TeacherAttendanceServiceImpl extends BaseServiceImpl<Long, TeacherA
|
|
|
|
|
|
teacherAttendance.setMusicGroupId(currentCourseDetail.getMusicGroupId());
|
|
|
teacherAttendance.setClassGroupId(currentCourseDetail.getClassId());
|
|
|
- teacherAttendance.setGroupType(classGroup.getGroupType());
|
|
|
+ teacherAttendance.setGroupType(teacherAttendance.getGroupType());
|
|
|
teacherAttendance.setRemark(teacherSignOutDto.getTeacherAttendanceInfo().getRemark());
|
|
|
int advanceSignMinutes = Integer.parseInt(sysConfigDao.findConfigValue(SysConfigService.ADVANCE_SIGN_IN_MINUTES));
|
|
|
|
|
@@ -102,7 +101,7 @@ public class TeacherAttendanceServiceImpl extends BaseServiceImpl<Long, TeacherA
|
|
|
if(courseSchedule == null){
|
|
|
throw new BizException("课程信息不存在");
|
|
|
}
|
|
|
- teacherAttendance.setCurrentClassTimes(courseScheduleDao.countCurrentTimes(classGroup.getId()) + 1);
|
|
|
+ teacherAttendance.setCurrentClassTimes(courseScheduleDao.countCurrentTimes(teacherAttendance.getClassGroupId()) + 1);
|
|
|
String classDate = DateUtil.format(courseSchedule.getClassDate(), DateUtil.DEFAULT_PATTERN);
|
|
|
String startClassTime = DateUtil.format(courseSchedule.getStartClassTime(), DateUtil.EXPANDED_TIME_FORMAT);
|
|
|
String endClassTime = DateUtil.format(courseSchedule.getEndClassTime(), DateUtil.EXPANDED_TIME_FORMAT);
|
|
@@ -173,7 +172,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.setGroupType(teacherAttendance.getGroupType());
|
|
|
courseHomework.setClassGroupId(currentCourseDetail.getClassId().intValue());
|
|
|
courseHomework.setExpectNum(studentAttendanceDao.countNormalAttendanceStudentNums(teacherAttendance.getCourseScheduleId()));
|
|
|
courseHomework.setExpiryDate(DateUtil.addDays(date,7));
|
|
@@ -283,6 +282,8 @@ public class TeacherAttendanceServiceImpl extends BaseServiceImpl<Long, TeacherA
|
|
|
e.setTeacherId(userId);
|
|
|
e.setStatus(StudentAttendanceStatusEnum.TRUANT);
|
|
|
e.setRemark("学员未到,自动补旷课");
|
|
|
+ e.setMusicGroupId(courseSchedule.getMusicGroupId());
|
|
|
+ e.setGroupType(courseSchedule.getGroupType());
|
|
|
});
|
|
|
studentAttendanceDao.addStudentAttendances(studentAttendances);
|
|
|
}
|