|
|
@@ -902,8 +902,11 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
|
|
|
e.setStudyReportUrl(baseUrl + "/#/reportDetailNew?id=" + courseScheduleEvaluate.getId() + "&classGroupId=" + e.getClassGroupId());
|
|
|
}
|
|
|
}
|
|
|
- if(practiceGroupTypeMap.containsKey(Long.valueOf(e.getMusicId()))){
|
|
|
- e.setPracticeType(PracticeGroupType.CARE_PACKAGE.equals(practiceGroupTypeMap.get(Long.valueOf(e.getMusicId())))?2:3);
|
|
|
+ if(Objects.nonNull(e.getPracticeId())&&practiceGroupTypeMap.containsKey(Long.valueOf(e.getPracticeId()))){
|
|
|
+ if(PracticeGroupType.CARE_PACKAGE.equals(practiceGroupTypeMap.get(Long.valueOf(e.getPracticeId()))))
|
|
|
+ e.setPracticeType(2);
|
|
|
+ else if(PracticeGroupType.COME_ON_PACKAGE.equals(practiceGroupTypeMap.get(Long.valueOf(e.getPracticeId()))))
|
|
|
+ e.setPracticeType(3);
|
|
|
}
|
|
|
}
|
|
|
if (ClassGroupTypeEnum.VIP == e.getType()) {
|
Joburgess