update

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

@@ -1037,8 +1037,8 @@
         <include refid="global.limit" />
     </select>
     
-    <select id="queryStudentExerciseMusicGroupListCount" resultType="java.lang.Integer">
-    	SELECT count(sees.music_group_id_) from student_extracurricular_exercises_situation_ sees 
+    <select id="queryStudentExerciseMusicGroupListCount" resultType="int">
+    	SELECT count(distinct sees.music_group_id_) from student_extracurricular_exercises_situation_ sees 
 		LEFT JOIN music_group mg on mg.id_ = sees.music_group_id_
 		WHERE sees.teacher_id_ = #{teacherId} and sees.serve_type_ = 'EXERCISE' and sees.actual_exercises_num_ = 0
 		<if test="musicGroupName != null and musicGroupName != ''">
@@ -1050,6 +1050,5 @@
 		<if test="sundayDate != null and sundayDate != ''">
 			and sees.sunday_ = #{sundayDate}
 		</if>
-		GROUP BY sees.music_group_id_
     </select>
 </mapper>

mec-teacher/src/main/java/com/ym/mec/teacher/controller/ExtracurricularExercisesController.java

@@ -173,13 +173,13 @@ public class ExtracurricularExercisesController extends BaseController {
 
     @ApiOperation(value = "获取服务学员查询条件")
     @GetMapping("/getDontServeStudentQueryCondition")
-    public HttpResponseResult getDontServeStudentQueryCondition(){
+    public HttpResponseResult getDontServeStudentQueryCondition(String musicGroupId){
         SysUser sysUser = sysUserFeignService.queryUserInfo();
         if(Objects.isNull(sysUser)){
             return failed(HttpStatus.FORBIDDEN,"请登录");
         }
         Map<String, Object> result = new HashMap<>();
-        List<BasicUserDto> dontServeStudents = extracurricularExercisesService.getDontServeStudents(sysUser.getId(), null, null, null, null,null,null);
+        List<BasicUserDto> dontServeStudents = extracurricularExercisesService.getDontServeStudents(sysUser.getId(), null, musicGroupId, null, null,null,null);
         if(CollectionUtils.isEmpty(dontServeStudents)){
             result.put("musicGroups", Collections.emptyList());
             result.put("classGroups", Collections.emptyList());

mec-teacher/src/main/java/com/ym/mec/teacher/controller/StudentExtracurricularExercisesSituationController.java

@@ -1,14 +1,18 @@
 package com.ym.mec.teacher.controller;
 
+import java.util.Objects;
+
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import com.ym.mec.auth.api.client.SysUserFeignService;
+import com.ym.mec.auth.api.entity.SysUser;
 import com.ym.mec.biz.dal.dto.MusicGroupExtracurricularSummaryDto;
 import com.ym.mec.biz.dal.page.StudentExerciseMusicGroupQueryInfo;
 import com.ym.mec.biz.service.ExtracurricularExercisesMessageService;
@@ -35,6 +39,11 @@ public class StudentExtracurricularExercisesSituationController extends BaseCont
     @ApiOperation(value = "课外训练乐团列表")
     @GetMapping("/queryStudentExerciseMusicGroupList")
     public HttpResponseResult<PageInfo<MusicGroupExtracurricularSummaryDto>> queryStudentExerciseMusicGroupList(StudentExerciseMusicGroupQueryInfo queryInfo){
+        SysUser sysUser = sysUserFeignService.queryUserInfo();
+        if(Objects.isNull(sysUser)){
+            return failed(HttpStatus.FORBIDDEN,"请登录");
+        }
+        queryInfo.setTeacherId(sysUser.getId());
         return succeed(studentExtracurricularExercisesSituationService.queryStudentExerciseMusicGroupList(queryInfo));
     }