1、待激活云教练导出文件新增【分部】【获得资格时间】字段

mec-biz/src/main/java/com/ym/mec/biz/service/impl/StudentAttendanceServiceImpl.java

@@ -80,7 +80,6 @@ public class StudentAttendanceServiceImpl extends BaseServiceImpl<Long, StudentA
     private MusicGroupPaymentCalenderDao musicGroupPaymentCalenderDao;
     @Autowired
     private SchoolStaffService schoolStaffService;
-
     @Autowired
     private MusicGroupDao musicGroupDao;
     @Override
@@ -703,9 +702,13 @@ public class StudentAttendanceServiceImpl extends BaseServiceImpl<Long, StudentA
                 //获取乐团编号
                 Set<String> musicGroupIds = dataList.stream().map(e -> e.getMusicGroupId()).collect(Collectors.toSet());
                 //只有后台列表需要乐团名称
-                Map<String,String> musicGroupMap = new HashMap<>();
+                Map<String,String> groupMap = new HashMap<>();
                 if(StringUtils.equals(queryInfo.getGroupType(),"MUSIC")){
-                    musicGroupMap = MapUtil.convertIntegerMap(musicGroupDao.queryMusicGroupNameMap(musicGroupIds));
+                    groupMap = MapUtil.convertIntegerMap(musicGroupDao.queryMusicGroupNameMap(musicGroupIds));
+                }else if (StringUtils.equals(queryInfo.getGroupType(),"VIP") || StringUtils.equals(queryInfo.getGroupType(),"LIVE")){
+                    groupMap = this.getMap("vip_group", "id_", "name_", musicGroupIds, queryInfo.getTenantId(), String.class, String.class);
+                }else if (StringUtils.equals(queryInfo.getGroupType(),"PRACTICE")){
+                    groupMap = this.getMap("practice_group", "id_", "name_", musicGroupIds, queryInfo.getTenantId(), String.class, String.class);
                 }
                 //获取学员编号
                 List<Integer> userIds = dataList.stream().map(e -> e.getUserId()).distinct().collect(Collectors.toList());
@@ -732,8 +735,8 @@ public class StudentAttendanceServiceImpl extends BaseServiceImpl<Long, StudentA
                         courseSchedule.setTeacherName(teacher.getUserName());
                         sa.setTeacherAvatar(teacher.getAvatar());
                     }
+                    sa.setMusicGroupName(groupMap.get(sa.getMusicGroupId()));
                     if(sa.getGroupType() == GroupType.MUSIC){
-                        sa.setMusicGroupName(musicGroupMap.get(sa.getMusicGroupId()));
                         if(dataList.size() <= 50){
                             Set<Integer> userId = new HashSet<Integer>();
                             userId.add(sa.getUserId());