|
@@ -590,6 +590,12 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
|
|
|
Map<String,Long> currentClassTimeMap = MapUtil.convertIntegerMap(courseScheduleDao.countCourseScheduleNum(vipGroupIds,"VIP"));
|
|
|
Map<String,String> lastOverTimeMap = MapUtil.convertIntegerMap(courseScheduleDao.findLastOverTime(vipGroupIds));
|
|
|
|
|
|
+ List<Map<String, BigDecimal>> groupCoursesUnitPriceMaps = courseScheduleStudentPaymentDao.findGroupCoursesUnitPrice(GroupType.VIP, vipGroupIds);
|
|
|
+ Map<String,BigDecimal> groupCoursesUnitPrice=new HashMap<>();
|
|
|
+ if(CollectionUtils.isEmpty(groupCoursesUnitPriceMaps)){
|
|
|
+ groupCoursesUnitPrice=MapUtil.convertIntegerMap(groupCoursesUnitPriceMaps);
|
|
|
+ }
|
|
|
+
|
|
|
Map<Integer, String> idNameMap=new HashMap<>();
|
|
|
if(!CollectionUtils.isEmpty(educationalTeacherIds)){
|
|
|
List<SimpleUserDto> educationalUsers = employeeDao.findByIds(educationalTeacherIds);
|
|
@@ -616,6 +622,8 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
|
|
|
|
|
|
vipGroup.setEducationalTeacherName(idNameMap.get(vipGroup.getEducationalTeacherId()));
|
|
|
|
|
|
+ vipGroup.setCourseUnitPrice(groupCoursesUnitPrice.get(String.valueOf(vipGroup.getId())));
|
|
|
+
|
|
|
if(queryInfo.getIsExport()){
|
|
|
List<GroupUserDto> groupStudents = groupStudentsMap.get(vipGroup.getId().toString());
|
|
|
if(!CollectionUtils.isEmpty(groupStudents)){
|