|
@@ -104,6 +104,12 @@ public class CourseHomeworkServiceImpl extends ServiceImpl<CourseHomeworkDao, Co
|
|
if (CollectionUtils.isEmpty(studentInfoList)) {
|
|
if (CollectionUtils.isEmpty(studentInfoList)) {
|
|
studentInfoList = new ArrayList<>();
|
|
studentInfoList = new ArrayList<>();
|
|
}
|
|
}
|
|
|
|
+
|
|
|
|
+ for (CourseHomeworkVo item : studentInfoList) {
|
|
|
|
+
|
|
|
|
+ item.setImUserId(MessageFormat.format("{0}:{1}", String.valueOf(item.getStudentId()), ClientEnum.STUDENT.name()));
|
|
|
|
+ }
|
|
|
|
+
|
|
Map<Long, List<CourseHomeworkVo>> studentCollect = studentInfoList.stream()
|
|
Map<Long, List<CourseHomeworkVo>> studentCollect = studentInfoList.stream()
|
|
.collect(Collectors.groupingBy( CourseHomeworkVo::getCourseId));
|
|
.collect(Collectors.groupingBy( CourseHomeworkVo::getCourseId));
|
|
|
|
|
|
@@ -112,6 +118,12 @@ public class CourseHomeworkServiceImpl extends ServiceImpl<CourseHomeworkDao, Co
|
|
if (CollectionUtils.isEmpty(teacherInfoList)) {
|
|
if (CollectionUtils.isEmpty(teacherInfoList)) {
|
|
teacherInfoList = new ArrayList<>();
|
|
teacherInfoList = new ArrayList<>();
|
|
}
|
|
}
|
|
|
|
+
|
|
|
|
+ for (CourseHomeworkVo item : teacherInfoList) {
|
|
|
|
+
|
|
|
|
+ item.setImUserId(String.valueOf(item.getTeacherId()));
|
|
|
|
+ }
|
|
|
|
+
|
|
Map<Long, List<CourseHomeworkVo>> teacherCollect = teacherInfoList.stream()
|
|
Map<Long, List<CourseHomeworkVo>> teacherCollect = teacherInfoList.stream()
|
|
.collect(Collectors.groupingBy( CourseHomeworkVo::getCourseId));
|
|
.collect(Collectors.groupingBy( CourseHomeworkVo::getCourseId));
|
|
|
|
|