|
@@ -152,6 +152,8 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
|
|
|
@Autowired
|
|
|
private EmployeeDao employeeDao;
|
|
|
@Autowired
|
|
|
+ private MusicGroupQuitDao musicGroupQuitDao;
|
|
|
+ @Autowired
|
|
|
private MusicGroupSchoolTermStudentCourseDetailDao musicGroupSchoolTermStudentCourseDetailDao;
|
|
|
@Autowired
|
|
|
private MusicGroupSchoolTermCourseDetailDao musicGroupSchoolTermCourseDetailDao;
|
|
@@ -1773,8 +1775,13 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
|
|
|
if (schedule.getGroupType() == MUSIC) {
|
|
|
Set<Long> collect = truantStudent.stream().map(e -> e.getStudentId()).collect(Collectors.toSet());
|
|
|
Map<Integer, String> paymentStatusMap = MapUtil.convertIntegerMap(musicGroupPaymentCalenderDao.queryUserCoursePaymentStatus(collect, schedule.getMusicGroupId()));
|
|
|
+
|
|
|
+ Map<Integer, Long> quitMap = MapUtil.convertIntegerMap(musicGroupQuitDao.queryQuitMapByStudentId(collect,schedule.getMusicGroupId()));
|
|
|
+ //学员是否有待审核的退团申请
|
|
|
truantStudent.forEach(studentAttendanceViewDto -> {
|
|
|
studentAttendanceViewDto.setPaymentStatus(paymentStatusMap.get(studentAttendanceViewDto.getStudentId().intValue()));
|
|
|
+ Long aLong = quitMap.get(studentAttendanceViewDto.getStudentId().intValue());
|
|
|
+ studentAttendanceViewDto.setQuitFlag(aLong==null?0:aLong.intValue());
|
|
|
});
|
|
|
}
|
|
|
List<StudentAttendanceViewDto> tempIds = truantStudent.stream()
|