|
@@ -531,8 +531,8 @@ public class StudentServiceImpl extends BaseServiceImpl<Integer, Student> implem
|
|
List<Map<Integer, String>> studentGroupEduMapList = studentRegistrationDao.queryStudentMusicGroupEduMap(studentIds);
|
|
List<Map<Integer, String>> studentGroupEduMapList = studentRegistrationDao.queryStudentMusicGroupEduMap(studentIds);
|
|
Map<Integer, String> studentGroupEduMap = MapUtil.convertIntegerMap(studentGroupEduMapList);
|
|
Map<Integer, String> studentGroupEduMap = MapUtil.convertIntegerMap(studentGroupEduMapList);
|
|
|
|
|
|
- List<Map<Integer, BigDecimal>> activeAmountMapList = cloudTeacherOrderDao.queryActiveAmountMap(studentIds);
|
|
|
|
- Map<Integer, BigDecimal> activeAmountMap = MapUtil.convertIntegerMap(activeAmountMapList);
|
|
|
|
|
|
+ List<Map<Long, BigDecimal>> activeAmountMapList = cloudTeacherOrderDao.queryActiveAmountMap(studentIds);
|
|
|
|
+ Map<Long, BigDecimal> activeAmountMap = MapUtil.convertIntegerMap(activeAmountMapList);
|
|
|
|
|
|
Set<Integer> hasVipCourseStudentIds = courseScheduleStudentPaymentDao.getHasVipCourseStudentIds(studentIds);
|
|
Set<Integer> hasVipCourseStudentIds = courseScheduleStudentPaymentDao.getHasVipCourseStudentIds(studentIds);
|
|
|
|
|
|
@@ -581,8 +581,8 @@ public class StudentServiceImpl extends BaseServiceImpl<Integer, Student> implem
|
|
if (StringUtils.isNotEmpty(eduOrganStudentListDto.getCurrentClass())) {
|
|
if (StringUtils.isNotEmpty(eduOrganStudentListDto.getCurrentClass())) {
|
|
data.setCurrentClass(eduOrganStudentListDto.getCurrentClass());
|
|
data.setCurrentClass(eduOrganStudentListDto.getCurrentClass());
|
|
}
|
|
}
|
|
- if(activeAmountMap.containsKey(data.getStudentId())){
|
|
|
|
- data.setActiveAmount(activeAmountMap.get(data.getStudentId()));
|
|
|
|
|
|
+ if(activeAmountMap.containsKey(data.getStudentId().longValue())){
|
|
|
|
+ data.setActiveAmount(activeAmountMap.get(data.getStudentId().longValue()));
|
|
}
|
|
}
|
|
if(studentGroupEduMap.containsKey(data.getStudentId())){
|
|
if(studentGroupEduMap.containsKey(data.getStudentId())){
|
|
data.setEducationName(studentGroupEduMap.get(data.getStudentId()));
|
|
data.setEducationName(studentGroupEduMap.get(data.getStudentId()));
|