|
@@ -1730,12 +1730,12 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
|
|
List<Map<Integer, Long>> studentSubjectIdMaps = subjectDao.findStudentSubjectIdMaps(tempIds);
|
|
List<Map<Integer, Long>> studentSubjectIdMaps = subjectDao.findStudentSubjectIdMaps(tempIds);
|
|
Map<Integer, Long> studentSubjectIdMap = MapUtil.convertIntegerMap(studentSubjectIdMaps);
|
|
Map<Integer, Long> studentSubjectIdMap = MapUtil.convertIntegerMap(studentSubjectIdMaps);
|
|
truantStudent.forEach(studentAttendanceViewDto -> {
|
|
truantStudent.forEach(studentAttendanceViewDto -> {
|
|
- if(studentAttendanceViewDto.getBeMerged()){
|
|
|
|
- studentAttendanceViewDto.setSubjectName("被合并学员");
|
|
|
|
- }else{
|
|
|
|
|
|
+// if(studentAttendanceViewDto.getBeMerged()){
|
|
|
|
+// studentAttendanceViewDto.setSubjectName("被合并学员");
|
|
|
|
+// }else{
|
|
studentAttendanceViewDto.setSubjectName(studentSubjectNameMap.get(studentAttendanceViewDto.getStudentId().intValue()));
|
|
studentAttendanceViewDto.setSubjectName(studentSubjectNameMap.get(studentAttendanceViewDto.getStudentId().intValue()));
|
|
studentAttendanceViewDto.setSubjectId(studentSubjectIdMap.get(studentAttendanceViewDto.getStudentId().intValue()));
|
|
studentAttendanceViewDto.setSubjectId(studentSubjectIdMap.get(studentAttendanceViewDto.getStudentId().intValue()));
|
|
- }
|
|
|
|
|
|
+// }
|
|
});
|
|
});
|
|
} else if (schedule.getGroupType() != MUSIC) {
|
|
} else if (schedule.getGroupType() != MUSIC) {
|
|
ClassGroup classGroup = classGroupDao.get(schedule.getClassGroupId());
|
|
ClassGroup classGroup = classGroupDao.get(schedule.getClassGroupId());
|