|
@@ -1,7 +1,7 @@
|
|
package com.ym.mec.biz.service.impl;
|
|
package com.ym.mec.biz.service.impl;
|
|
|
|
|
|
import com.alibaba.fastjson.JSON;
|
|
import com.alibaba.fastjson.JSON;
|
|
-import com.beust.jcommander.internal.Lists;
|
|
|
|
|
|
+import com.google.common.collect.Lists;
|
|
import com.ym.mec.auth.api.client.SysUserFeignService;
|
|
import com.ym.mec.auth.api.client.SysUserFeignService;
|
|
import com.ym.mec.auth.api.entity.SysUser;
|
|
import com.ym.mec.auth.api.entity.SysUser;
|
|
import com.ym.mec.biz.dal.dao.*;
|
|
import com.ym.mec.biz.dal.dao.*;
|
|
@@ -23,6 +23,7 @@ import com.ym.mec.im.ImFeignService;
|
|
import com.ym.mec.util.collection.MapUtil;
|
|
import com.ym.mec.util.collection.MapUtil;
|
|
import com.ym.mec.util.date.DateUtil;
|
|
import com.ym.mec.util.date.DateUtil;
|
|
import com.ym.mec.web.WebFeignService;
|
|
import com.ym.mec.web.WebFeignService;
|
|
|
|
+import io.swagger.models.auth.In;
|
|
import lombok.extern.slf4j.Slf4j;
|
|
import lombok.extern.slf4j.Slf4j;
|
|
import org.apache.commons.lang3.StringUtils;
|
|
import org.apache.commons.lang3.StringUtils;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
@@ -465,7 +466,6 @@ public class StudentManageServiceImpl implements StudentManageService {
|
|
@Override
|
|
@Override
|
|
public List<StudentManageBaseInfoOfMusicGroupDto> findStudentMusicGroupsByUserId(Integer userId) {
|
|
public List<StudentManageBaseInfoOfMusicGroupDto> findStudentMusicGroupsByUserId(Integer userId) {
|
|
List<StudentManageBaseInfoOfMusicGroupDto> musicGroups = studentManageDao.findStudentMusicGroupsByUserId(userId);
|
|
List<StudentManageBaseInfoOfMusicGroupDto> musicGroups = studentManageDao.findStudentMusicGroupsByUserId(userId);
|
|
-
|
|
|
|
List<CloudTeacherOrderWrapper.StudentMemberDetail> effectiveCloudTeacherOrder = cloudTeacherOrderService.getEffectiveCloudTeacherOrder(Lists.newArrayList(userId));
|
|
List<CloudTeacherOrderWrapper.StudentMemberDetail> effectiveCloudTeacherOrder = cloudTeacherOrderService.getEffectiveCloudTeacherOrder(Lists.newArrayList(userId));
|
|
//获取学员报名时所选乐器
|
|
//获取学员报名时所选乐器
|
|
if (musicGroups.size() > 0) {
|
|
if (musicGroups.size() > 0) {
|