教师端课程组新增状态选择

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

@@ -277,7 +277,7 @@ public interface ClassGroupDao extends BaseDAO<Integer, ClassGroup> {
      * @params [teacherId]
      * @describe 获取老师陪练课班级
      */
-    List<TeacherClassGroupDto> findTeacherPracticeClassGroup(@Param("teacherId") Long teacherId);
+    List<TeacherClassGroupDto> findTeacherPracticeClassGroup(@Param("teacherId") Long teacherId, @Param("status") String status);
 
     /**
      * 根据老师编号列表获取小课数量
@@ -294,7 +294,7 @@ public interface ClassGroupDao extends BaseDAO<Integer, ClassGroup> {
      * @params [teacherId]
      * @describe 获取老师vip课班级
      */
-    List<TeacherClassGroupDto> findTeacherVipClassGroup(@Param("teacherId") Long teacherId);
+    List<TeacherClassGroupDto> findTeacherVipClassGroup(@Param("teacherId") Long teacherId, @Param("status") String status);
 
     /**
      * 根据合奏班编号列表，获取单技班名称列表

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

@@ -235,7 +235,7 @@ public interface ClassGroupService extends BaseService<Integer, ClassGroup> {
      * @return java.util.List<com.ym.mec.biz.dal.dto.TeacherClassGroupDto>
      * @describe 获取老师所在班级列表
      */
-    List<TeacherClassGroupDto> findTeacherClassGroups(String type);
+    List<TeacherClassGroupDto> findTeacherClassGroups(String type,String status);
 
     /**
      * @Author: Joburgess

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

@@ -1354,7 +1354,7 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
     }
 
     @Override
-    public List<TeacherClassGroupDto> findTeacherClassGroups(String type) {
+    public List<TeacherClassGroupDto> findTeacherClassGroups(String type,String status) {
         SysUser user = sysUserFeignService.queryUserInfo();
         if (Objects.isNull(user)) {
             throw new BizException("请登录");
@@ -1367,13 +1367,13 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
         List<TeacherClassGroupDto> teacherMusicClassGroup;
         switch (type) {
             case "VIP":
-                teacherMusicClassGroup = classGroupDao.findTeacherVipClassGroup(user.getId().longValue());
+                teacherMusicClassGroup = classGroupDao.findTeacherVipClassGroup(user.getId().longValue(),status);
                 break;
             case "MUSIC_GROUP":
                 teacherMusicClassGroup = classGroupDao.findTeacherMusicClassGroup(user.getId().longValue());
                 break;
             case "PRACTICE":
-                teacherMusicClassGroup = classGroupDao.findTeacherPracticeClassGroup(user.getId().longValue());
+                teacherMusicClassGroup = classGroupDao.findTeacherPracticeClassGroup(user.getId().longValue(),status);
                 break;
             default:
                 throw new BizException("课程类型错误");

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

@@ -598,6 +598,15 @@
             LEFT JOIN class_group cg ON pg.id_=cg.music_group_id_ AND cg.group_type_='PRACTICE'
         WHERE
             pg.user_id_ = #{teacherId} AND cg.del_flag_ = 0 AND pg.group_status_!='CANCEL' AND pg.group_status_!='LOCK'
+            <if test="status == null or status == ''">
+                AND pg.group_status_!='CANCEL' AND pg.group_status_!='LOCK'
+            </if>
+            <if test="status == 'NORMAL'">
+                AND pg.group_status_ IN ('APPLYING','NORMAL','LOCK')
+            </if>
+            <if test="status == 'FINISH'">
+                AND pg.group_status_ = 'FINISH'
+            </if>
     </select>
     <select id="findTeacherVipClassGroup" resultMap="TeacherClassGroupDto">
         SELECT
@@ -623,7 +632,16 @@
             LEFT JOIN course_schedule cs ON cg.id_=cs.class_group_id_
             LEFT JOIN school s ON vg.teacher_school_id_ = s.id_
         WHERE
-            vg.user_id_ = #{teacherId} AND vg.group_status_!=7 AND (vg.group_status_ = 2 OR vg.group_status_ = 5)
+            vg.user_id_ = #{teacherId}
+            <if test="status == null or status == ''">
+                AND vg.group_status_ != 7 AND (vg.group_status_ = 2 OR vg.group_status_ = 5)
+            </if>
+            <if test="status == 'NORMAL'">
+                AND vg.group_status_ IN (1,2,5,6)
+            </if>
+            <if test="status == 'FINISH'">
+                AND vg.group_status_ = 4
+            </if>
         GROUP BY
         vg.id_,cg.id_
     </select>

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

@@ -45,8 +45,8 @@ public class ClassGroupController extends BaseController {
 
     @ApiOperation(value = "教师关联班级获取")
     @GetMapping("/findTeacherClassGroups")
-    public Object findTeacherClassGroups(@ApiParam(value = "课程类型：MUSIC_GROUP，VIP,PRACTICE", required = true)String type){
-        return succeed(classGroupService.findTeacherClassGroups(type));
+    public Object findTeacherClassGroups(String type,String status){
+        return succeed(classGroupService.findTeacherClassGroups(type,status));
     }
 
     @ApiOperation(value = "获取教师班级详情界面头部信息")