学校学生只看进行中的

mec-auth/mec-auth-server/src/main/java/com/ym/mec/auth/core/provider/PhoneAuthenticationProvider.java

@@ -147,7 +147,7 @@ public class PhoneAuthenticationProvider extends AbstractAuthenticationProvider
                     user.setUpdateTime(new Date());
 
                     if (userInfo.getSysUser().getUserType().contains("SCHOOL")) {
-                        throw new LockedException("用户已注册");
+                        throw new LockedException("用户已存在学校账户");
                     }
                     // 添加userType以及附加信息
                     if (StringUtils.equals("STUDENT", clientId)) {

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

@@ -1405,11 +1405,6 @@ public class StudentServiceImpl extends BaseServiceImpl<Integer, Student> implem
         StudentWrapper.StudentList studentList = studentListIPage.getRecords().get(0);
         StudentWrapper.StudentDetail studentDetail = JSON.parseObject(JSON.toJSONString(studentList), StudentWrapper.StudentDetail.class);
 
-        // 查询学生信息
-        StudentRegistration studentRegister = studentRegistrationService.getStudentRegister(queryInfo.getMusicGroupId(), queryInfo.getStudentId());
-        if (studentRegister == null) {
-            return studentDetail;
-        }
         // 学校分部
         CooperationOrgan cooperationOrgan = cooperationOrganService.get(queryInfo.getCooperationOrganId());
         studentDetail.setOrganId(cooperationOrgan.getOrganId());
@@ -1439,22 +1434,29 @@ public class StudentServiceImpl extends BaseServiceImpl<Integer, Student> implem
             studentDetail.setArtPracticeCount(schoolActivities.size());
         }
 
-        // 在团状态
-        MusicGroupQuit musicGroupQuit = musicGroupQuitDao
-                .queryByUserIdAndMusicGroupId(queryInfo.getStudentId(), queryInfo.getMusicGroupId());
-
-        if (StudentMusicGroupStatusEnum.APPLY.equals(studentRegister.getMusicGroupStatus())) {
-            studentDetail.setInGroupStatus(EInGroupStatus.APPLY);
-        } else if (StudentMusicGroupStatusEnum.QUIT.equals(studentRegister.getMusicGroupStatus())) {
-            studentDetail.setInGroupStatus(EInGroupStatus.OUT);
-            studentDetail.setQuitTime(musicGroupQuit.getQuitDate());
-        } else if (StudentMusicGroupStatusEnum.NORMAL.equals(studentRegister.getMusicGroupStatus())) {
-            studentDetail.setInGroupStatus(EInGroupStatus.IN);
-            if (musicGroupQuit != null && musicGroupQuit.getStatus().equals(ApprovalStatus.PROCESSING)) {
-                studentDetail.setInGroupStatus(EInGroupStatus.APPLY_OUT);
+        // 查询学生信息
+        if (queryInfo.getMusicGroupId() != null) {
+            StudentRegistration studentRegister = studentRegistrationService.getStudentRegister(queryInfo.getMusicGroupId(), queryInfo.getStudentId());
+            if (studentRegister == null) {
+                return studentDetail;
+            }
+            // 在团状态
+            MusicGroupQuit musicGroupQuit = musicGroupQuitDao
+                    .queryByUserIdAndMusicGroupId(queryInfo.getStudentId(), queryInfo.getMusicGroupId());
+
+            if (StudentMusicGroupStatusEnum.APPLY.equals(studentRegister.getMusicGroupStatus())) {
+                studentDetail.setInGroupStatus(EInGroupStatus.APPLY);
+            } else if (StudentMusicGroupStatusEnum.QUIT.equals(studentRegister.getMusicGroupStatus())) {
+                studentDetail.setInGroupStatus(EInGroupStatus.OUT);
+                studentDetail.setQuitTime(musicGroupQuit.getQuitDate());
+            } else if (StudentMusicGroupStatusEnum.NORMAL.equals(studentRegister.getMusicGroupStatus())) {
+                studentDetail.setInGroupStatus(EInGroupStatus.IN);
+                if (musicGroupQuit != null && musicGroupQuit.getStatus().equals(ApprovalStatus.PROCESSING)) {
+                    studentDetail.setInGroupStatus(EInGroupStatus.APPLY_OUT);
+                }
+            } else if (StudentMusicGroupStatusEnum.QUIT_SCHOOL.equals(studentRegister.getMusicGroupStatus())) {
+                studentDetail.setInGroupStatus(EInGroupStatus.QUIT_SCHOOL);
             }
-        } else if (StudentMusicGroupStatusEnum.QUIT_SCHOOL.equals(studentRegister.getMusicGroupStatus())) {
-            studentDetail.setInGroupStatus(EInGroupStatus.QUIT_SCHOOL);
         }
 
         return studentDetail;

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

@@ -1262,6 +1262,7 @@
         from music_group
             left join student_registration on music_group.id_ = student_registration.music_group_id_
         <where>
+            music_group.status_ = 'PROGRESS'
             <if test="statusList != null and statusList.size() != 0">
                 and student_registration.music_group_status_ in
                 <foreach collection="statusList" item="status" open="(" close=")" separator=",">

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

@@ -13,14 +13,13 @@
         left join sys_user su on su.id_ = s.user_id_
         left join student_registration sr on sr.user_id_ = s.user_id_
 
-        <if test="param.cooperationOrganId != null">
-            left join music_group mg on mg.id_ = sr.music_group_id_
-        </if>
+        left join music_group mg on mg.id_ = sr.music_group_id_
         <where>
             sr.music_group_status_ in
             <foreach collection="param.statusList" close=")" item="status" open="(" separator=",">
                 #{status}
             </foreach>
+            and mg.status_ = 'PROGRESS'
             <if test="param.keyword != null and param.keyword != ''">
                 and (su.username_ like concat('%', #{param.keyword}, '%'))
             </if>