Merge remote-tracking branch 'origin/music_detail' into music_detail

mec-biz/src/main/java/com/ym/mec/biz/service/ClassGroupService.java

@@ -585,4 +585,6 @@ public interface ClassGroupService extends BaseService<Integer, ClassGroup> {
      * @param classGroupId
      */
     void cancelPreCourseSchedule(Integer musicGroupSchoolTermCourseDetailId, Integer classGroupId);
+
+    List<ClassGroup> queryStudentClassGroupsAndTeacher(String musicGroupId);
 }

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

@@ -2747,6 +2747,21 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
     }
 
     @Override
+    public List<ClassGroup> queryStudentClassGroupsAndTeacher(String musicGroupId) {
+        SysUser sysUser = sysUserFeignService.queryUserInfo();
+        if(sysUser == null){
+            throw new BizException("请登录");
+        }
+        List<ClassGroup> classGroups = classGroupDao.queryStudentClassGroups(musicGroupId, sysUser.getId());
+        if(classGroups.size() == 0){
+            classGroups.forEach(e->{
+                e.setTeacherMapperList(classGroupTeacherMapperDao.findClassGroupTeachers(e.getId().toString()));
+            });
+        }
+        return classGroups;
+    }
+
+    @Override
     @Transactional(rollbackFor = Exception.class)
     public HttpResponseResult preCourseSchedule(List<ClassGroup4MixDto> classGroup4MixDtos) {
         Date date = new Date();

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

@@ -43,6 +43,7 @@
     <resultMap id="Mapper" type="com.ym.mec.biz.dal.dto.Mapper">
         <result column="key_" property="key"/>
         <result column="value_" property="value"/>
+        <result column="courseScheduleId_" property="courseScheduleId"/>
     </resultMap>
 
     <insert id="insert" parameterType="com.ym.mec.biz.dal.entity.ClassGroup" useGeneratedKeys="true" keyColumn="id"
@@ -1534,8 +1535,8 @@
     </select>
     
     <select id="countTeacherByMusicGroupId" resultMap="Mapper">
-		select cg.name_ key_,GROUP_CONCAT(u.real_name_) value_ from class_group cg LEFT JOIN class_group_teacher_mapper cgtm on cg.id_ = cgtm.class_group_id_
+		select cg.id_ courseScheduleId_,cg.name_ key_,GROUP_CONCAT(u.real_name_) value_ from class_group cg LEFT JOIN class_group_teacher_mapper cgtm on cg.id_ = cgtm.class_group_id_
 		LEFT JOIN sys_user u on u.id_ = cgtm.user_id_
-		where cg.del_flag_ = 0 and cg.group_type_ = 'MUSIC' and cg.music_group_id_ = #{musicGroupId}  group by cg.name_ 
+		where cg.del_flag_ = 0 and cg.group_type_ = 'MUSIC' and cg.music_group_id_ = #{musicGroupId} order by cg.type_  group by cg.id_
     </select>
 </mapper>

mec-biz/src/main/resources/config/mybatis/CooperationOrganLinkmanMapper.xml

@@ -114,7 +114,7 @@
 	</select>
 	
 	<select id="queryByCooperationOrganId" resultMap="CooperationOrganLinkman">
-		SELECT * FROM cooperation_organ_linkman where cooperation_organ_id_ = #{cooperationOrganId} ORDER BY id_ desc
+		SELECT * FROM cooperation_organ_linkman where cooperation_organ_id_ = #{cooperationOrganId} ORDER BY id_ asc
 	</select>
 	
 	<delete id="deleteByCooperationOrganId">

mec-biz/src/main/resources/config/mybatis/MusicGroupQuestionnaireMapper.xml

@@ -20,7 +20,9 @@
 	
 	<!-- 根据主键查询一条记录 -->
 	<select id="get" resultMap="MusicGroupQuestionnaire" >
-		SELECT * FROM music_group_questionnaire WHERE id_ = #{id} 
+		SELECT mgq.*,su.real_name_ FROM music_group_questionnaire mgq
+		LEFT JOIN sys_user su ON su.id_ = mgq.operator_id_
+		WHERE mgq.id_ = #{id}
 	</select>
 	
 	<!-- 全查询 -->

mec-student/src/main/java/com/ym/mec/student/controller/MusicGroupDetailController.java

@@ -2,6 +2,9 @@ package com.ym.mec.student.controller;
 
 import com.ym.mec.auth.api.client.SysUserFeignService;
 import com.ym.mec.auth.api.entity.SysUser;
+import com.ym.mec.biz.dal.dao.ClassGroupDao;
+import com.ym.mec.biz.dal.dto.Mapper;
+import com.ym.mec.biz.dal.entity.MusicGroup;
 import com.ym.mec.biz.dal.entity.MusicGroupTrainPlanSaveDto;
 import com.ym.mec.biz.dal.enums.YesOrNoEnum;
 import com.ym.mec.biz.dal.page.MusicGroupPerformanceQueryInfo;
@@ -13,8 +16,12 @@ import com.ym.mec.common.page.QueryInfo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.ui.ModelMap;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.List;
+
 @RequestMapping("musicGroupDetail")
 @Api(tags = "乐团档案服务")
 @RestController
@@ -32,6 +39,8 @@ public class MusicGroupDetailController extends BaseController {
     private MusicGroupTrainPlanService musicGroupTrainPlanService;
     @Autowired
     private MusicGroupService musicGroupService;
+    @Autowired
+    private ClassGroupService classGroupService;
 
     @ApiOperation("获取学员退团页面数据")
     @RequestMapping(value = "getQuitGroupDetail")
@@ -72,4 +81,9 @@ public class MusicGroupDetailController extends BaseController {
         return succeed(photoService.queryPhotoPage(queryInfo));
     }
 
+    @ApiOperation(value = "查询学员班级列表")
+    @GetMapping("/queryStudentAndTeacher")
+    public Object queryStudentClassGroupsAndTeacher(String musicGroupId) {
+        return succeed(classGroupService.queryStudentClassGroupsAndTeacher(musicGroupId));
+    }
 }