Merge remote-tracking branch 'origin/master'

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

@@ -454,4 +454,12 @@ public interface ClassGroupService extends BaseService<Integer, ClassGroup> {
      * @return
      */
     List<RemainCourseTypeDurationDto> queryRemainCourseTypeDuration(String classGroupIdList);
+
+    /**
+     * 进行中乐团-修改-班级详情-学员班级调整详情
+     * @author zouxuan
+     * @param musicGroupId
+     * @return
+     */
+    Map<String,Object> studentClassAuditDetail(String musicGroupId);
 }

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

@@ -3264,4 +3264,15 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
 	public List<RemainCourseTypeDurationDto> queryRemainCourseTypeDuration(String classGroupIdList) {
 		return courseScheduleDao.queryRemainCourseTypeDuration(classGroupIdList);
 	}
+
+    @Override
+    public Map<String, Object> studentClassAuditDetail(String musicGroupId) {
+        //获取班级列表
+        List<ClassGroup> classGroups = classGroupDao.queryClassGroups(musicGroupId, null);
+        //获取班级里学员列表
+
+        //获取班级剩余的课程类型和课程数量
+
+        return null;
+    }
 }

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

@@ -1308,6 +1308,9 @@
         AND type_ IN ('HIGH','HIGH_ONLINE') AND del_flag_ = '0'
     </select>
     <select id="queryClassGroups" resultMap="ClassGroup">
-        SELECT cg.* FROM class_group cg WHERE cg.music_group_id_ = #{practiceGroupId} AND cg.group_type_ = #{groupType}
+        SELECT cg.* FROM class_group cg WHERE cg.music_group_id_ = #{practiceGroupId}
+        <if test="groupType != null and groupType != ''">
+            AND cg.group_type_ = #{groupType}
+        </if>
     </select>
 </mapper>

mec-web/src/main/java/com/ym/mec/web/controller/ClassGroupController.java

@@ -333,4 +333,11 @@ public class ClassGroupController extends BaseController {
     public HttpResponseResult queryRemainCourseTypeDuration(String classGroupIdList){
         return succeed(classGroupService.queryRemainCourseTypeDuration(classGroupIdList));
     }
+
+    @ApiOperation(value = "进行中乐团-修改-班级详情-学员班级调整详情")
+    @GetMapping("/studentClassAuditDetail")
+    @PreAuthorize("@pcs.hasPermissions('classGroup/studentClassAuditDetail')")
+    public HttpResponseResult studentClassAuditDetail(String musicGroupId){
+        return succeed(classGroupService.studentClassAuditDetail(musicGroupId));
+    }
 }