|
@@ -17,7 +17,6 @@ import com.ym.mec.biz.dal.page.*;
|
|
|
import com.ym.mec.biz.dal.school.dto.ClassesForDayDto;
|
|
|
import com.ym.mec.biz.dal.school.dto.CourseStudentDto;
|
|
|
import com.ym.mec.biz.dal.vo.CourseScheduleWrapper;
|
|
|
-import com.ym.mec.biz.dal.vo.ImLiveBroadcastRoomVo;
|
|
|
import com.ym.mec.biz.dal.vo.ImLiveRoomVideoVo;
|
|
|
import com.ym.mec.biz.dal.wrapper.DailySummaryOfClassesForTheCurrentSemesterWrapper;
|
|
|
import com.ym.mec.biz.dal.wrapper.LiveGroupWrapper;
|
|
@@ -197,8 +196,6 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
|
|
|
@Autowired
|
|
|
private ImLiveBroadcastRoomService imLiveBroadcastRoomService;
|
|
|
|
|
|
- @Autowired
|
|
|
- private ImLiveRoomVideoService imLiveRoomVideoService;
|
|
|
|
|
|
@Autowired
|
|
|
private ImLiveRoomVideoDao imLiveRoomVideoDao;
|
|
@@ -419,7 +416,7 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
|
|
|
.map(courseSchedule -> courseSchedule.getId())
|
|
|
.collect(Collectors.toList());
|
|
|
courseScheduleDao.deleteMusicGroupCourseSchedulesWithStudent(courseScheduleIds, userId);
|
|
|
- studentAttendanceDao.deleteByCourseAndUser(courseScheduleIds,userId)
|
|
|
+ studentAttendanceDao.deleteByCourseAndUser(courseScheduleIds,userId);
|
|
|
}
|
|
|
}
|
|
|
|
|
@@ -3928,7 +3925,6 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
|
|
|
}
|
|
|
CourseAttendanceDetailHeadInfoDto courseAttendanceDetailHeadInfoDto = courseScheduleDao.findByCourse(courseScheduleId);
|
|
|
courseAttendanceDetailHeadInfoDto.setLatestAttendanceTime(studentAttendanceDao.findLatestAttendanceDate(courseScheduleId));
|
|
|
- courseAttendanceDetailHeadInfoDto.setStudentNum(studentAttendanceDao.getStudentNumByStatus(courseScheduleId, StudentAttendanceStatusEnum.NORMAL));
|
|
|
courseAttendanceDetailHeadInfoDto.setLeaveStudentNum(studentAttendanceDao.getStudentNumByStatus(courseScheduleId, StudentAttendanceStatusEnum.LEAVE));
|
|
|
courseAttendanceDetailHeadInfoDto.setTruantStudentNum(studentAttendanceDao.getStudentNumByStatus(courseScheduleId, StudentAttendanceStatusEnum.TRUANT));
|
|
|
courseAttendanceDetailHeadInfoDto.setLateStudentNum(studentAttendanceDao.getStudentNumByStatus(courseScheduleId, StudentAttendanceStatusEnum.LATE));
|
|
@@ -5914,19 +5910,6 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
|
|
|
List<CourseScheduleDto> teacherCourseFormat = getTeacherCourseFormat(queryInfo.getTeacherId(), new Date(),
|
|
|
queryInfo.getTenantId(), new Date(), courseScheduleDtos, courseIds, courseIds);
|
|
|
|
|
|
- // 直播房间id集合
|
|
|
-// List<String> roomIdList = teacherCourseFormat.stream().map(CourseScheduleDto::getLiveRoomId).collect(Collectors.toList());
|
|
|
-//
|
|
|
-// // 查询直播间视频数
|
|
|
-// Map<String, Integer> uidCountMap = imLiveRoomVideoService.queryRoomUidCountMap(roomIdList);
|
|
|
-// for (CourseScheduleDto record : teacherCourseFormat) {
|
|
|
-// Integer count = uidCountMap.get(record.getLiveRoomId());
|
|
|
-// if (count == null) {
|
|
|
-// record.setVideoNum(0);
|
|
|
-// }
|
|
|
-// record.setVideoNum(count);
|
|
|
-// }
|
|
|
-
|
|
|
return page.setRecords(teacherCourseFormat);
|
|
|
}
|
|
|
|