|
@@ -1516,18 +1516,18 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
|
|
|
String[] studentNums = classGroupStudentMapperDao.findStudentNumByClassGroupId(teacherClassGroupDto.getClassGroupId());
|
|
|
teacherClassGroupDto.setStudentNames(StringUtils.join(studentNums, ","));
|
|
|
}
|
|
|
+ if (teacherClassGroupDto.getOnlineClassesNum() > 0 && teacherClassGroupDto.getOffLineClassesNum() <= 0) {
|
|
|
+ teacherClassGroupDto.setClassMode(1);
|
|
|
+ } else if (teacherClassGroupDto.getOnlineClassesNum() > 0 && teacherClassGroupDto.getOffLineClassesNum() > 0) {
|
|
|
+ teacherClassGroupDto.setClassMode(3);
|
|
|
+ } else if (teacherClassGroupDto.getOnlineClassesNum() <= 0 && teacherClassGroupDto.getOffLineClassesNum() > 0) {
|
|
|
+ teacherClassGroupDto.setClassMode(2);
|
|
|
+ } else {
|
|
|
+ teacherClassGroupDto.setClassMode(0);
|
|
|
+ }
|
|
|
if (teacherClassGroupDto.getType() == ClassGroupTypeEnum.VIP) {
|
|
|
String[] studentNums = classGroupStudentMapperDao.findStudentNumByClassGroupId(teacherClassGroupDto.getClassGroupId());
|
|
|
teacherClassGroupDto.setStudentNames(StringUtils.join(studentNums, ","));
|
|
|
- if (teacherClassGroupDto.getOnlineClassesNum() > 0 && teacherClassGroupDto.getOffLineClassesNum() <= 0) {
|
|
|
- teacherClassGroupDto.setClassMode(1);
|
|
|
- } else if (teacherClassGroupDto.getOnlineClassesNum() > 0 && teacherClassGroupDto.getOffLineClassesNum() > 0) {
|
|
|
- teacherClassGroupDto.setClassMode(3);
|
|
|
- } else if (teacherClassGroupDto.getOnlineClassesNum() <= 0 && teacherClassGroupDto.getOffLineClassesNum() > 0) {
|
|
|
- teacherClassGroupDto.setClassMode(2);
|
|
|
- } else {
|
|
|
- teacherClassGroupDto.setClassMode(0);
|
|
|
- }
|
|
|
|
|
|
Integer overCourses = vipGroupOverCourseMaps.get(teacherClassGroupDto.getMusicGroupId());
|
|
|
if (Objects.isNull(overCourses)) {
|
|
@@ -1639,9 +1639,23 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
|
|
|
String subjectNames = subjectDao.findNames(classGroup.getSubjectIdList());
|
|
|
|
|
|
TeacherClassHeadInfo teacherClassHeadInfo = new TeacherClassHeadInfo();
|
|
|
+ //获取班级的线上、线下课数量
|
|
|
+ int onlineCourseNum = classGroupDao.countCourseNum(classGroupId,"ONLINE");
|
|
|
+ int offlineCourseNum = classGroupDao.countCourseNum(classGroupId,"OFFLINE");
|
|
|
+
|
|
|
+ if (onlineCourseNum > 0 && offlineCourseNum <= 0) {
|
|
|
+ teacherClassHeadInfo.setTeachMode("1");
|
|
|
+ } else if (onlineCourseNum > 0 && offlineCourseNum > 0) {
|
|
|
+ teacherClassHeadInfo.setTeachMode("3");
|
|
|
+ } else if (onlineCourseNum <= 0 && offlineCourseNum > 0) {
|
|
|
+ teacherClassHeadInfo.setTeachMode("2");
|
|
|
+ } else {
|
|
|
+ teacherClassHeadInfo.setTeachMode("0");
|
|
|
+ }
|
|
|
teacherClassHeadInfo.setStudentNum(classGroupStudentMapperDao.countClassGroupStudentNum(classGroup.getId()));
|
|
|
teacherClassHeadInfo.setCurrentClassTimes(courseScheduleDao.countCurrentTimes(classGroup.getId(), new Date()));
|
|
|
teacherClassHeadInfo.setTotalClassTimes(courseScheduleDao.countClassGroupCourses(classGroup.getId()));
|
|
|
+ teacherClassHeadInfo.setSurplusClassTimes(teacherClassHeadInfo.getTotalClassTimes()-teacherClassHeadInfo.getCurrentClassTimes());
|
|
|
if (subjectNames != null && !subjectNames.isEmpty()) {
|
|
|
teacherClassHeadInfo.setSubjectNames(subjectNames);
|
|
|
}
|