zouxuan před 5 roky
rodič
revize
804aac9bef

+ 7 - 0
mec-biz/src/main/java/com/ym/mec/biz/dal/dao/ClassGroupDao.java

@@ -107,4 +107,11 @@ public interface ClassGroupDao extends BaseDAO<Integer, ClassGroup> {
      * @return
      */
     List<ImGroupModel> queryUserGroups(Integer userId);
+
+    /**
+     * 获取vip课的学生名称列表
+     * @param musicGroupId
+     * @return
+     */
+    List<String> findVipStuNames(String musicGroupId);
 }

+ 5 - 3
mec-biz/src/main/java/com/ym/mec/biz/dal/dto/CourseListDto.java

@@ -2,13 +2,15 @@ package com.ym.mec.biz.dal.dto;
 
 import io.swagger.annotations.ApiModelProperty;
 
+import java.util.List;
+
 public class CourseListDto {
 
     @ApiModelProperty(value = "乐团、vip课编号",required = true)
     private String musicGroupId;
 
     @ApiModelProperty(value = "学生姓名",required = true)
-    private String studentNames;
+    private List<String> studentNames;
 
     @ApiModelProperty(value = "乐团、vip课名称",required = true)
     private String musicGroupName;
@@ -36,11 +38,11 @@ public class CourseListDto {
         this.musicGroupId = musicGroupId;
     }
 
-    public String getStudentNames() {
+    public List<String> getStudentNames() {
         return studentNames;
     }
 
-    public void setStudentNames(String studentNames) {
+    public void setStudentNames(List<String> studentNames) {
         this.studentNames = studentNames;
     }
 

+ 7 - 1
mec-biz/src/main/java/com/ym/mec/biz/service/impl/ClassGroupServiceImpl.java

@@ -229,7 +229,7 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
     @Override
     public PageInfo<TeacherVipClassInfoDto> getTeacherVipClass(VipClassQueryInfo queryInfo) {
         PageInfo<TeacherVipClassInfoDto> pageInfo = new PageInfo<>(queryInfo.getPage(), queryInfo.getRows());
-        Map<String, Object> params = new HashMap<String, Object>();
+        Map<String, Object> params = new HashMap<>();
         MapUtil.populateMap(params, queryInfo);
         List<TeacherVipClassInfoDto> dataList = null;
         int count = classGroupDao.countTeacherVipClass(params);
@@ -323,6 +323,12 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
     }
 
     public List<CourseListDto> queryCoursePage(Integer userId) {
+        List<CourseListDto> courseListDtos = classGroupDao.queryCoursePage(userId);
+        courseListDtos.forEach(e->{
+            if("VIP".equals(e.getTeachMode())){
+                classGroupDao.findVipStuNames(e.getMusicGroupId());
+            }
+        });
         return classGroupDao.queryCoursePage(userId);
     }
 

+ 6 - 0
mec-biz/src/main/resources/config/mybatis/ClassGroupMapper.xml

@@ -297,4 +297,10 @@
         LEFT JOIN class_group cg ON cgsm.class_group_id_ = cg.id_
         WHERE cgsm.user_id_ = #{userId}
     </select>
+    <select id="findVipStuNames" resultType="java.lang.String">
+        SELECT su.username_ FROM vip_group_class_group_mapper vgcgm
+        LEFT JOIN class_group_student_mapper cgsm ON vgcgm.class_group_id_ = cgsm.class_group_id_
+        LEFT JOIN sys_user su ON cgsm.user_id_ = su.id_
+        WHERE vgcgm.vip_group_id_ = #{musicGroupId}
+    </select>
 </mapper>

+ 0 - 2
mec-student/src/main/java/com/ym/mec/student/controller/CourseController.java

@@ -4,8 +4,6 @@ import com.ym.mec.auth.api.client.SysUserFeignService;
 import com.ym.mec.auth.api.entity.SysUser;
 import com.ym.mec.biz.service.ClassGroupService;
 import com.ym.mec.common.controller.BaseController;
-import com.ym.mec.common.security.AuthUser;
-import com.ym.mec.common.security.SecurityUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;