Merge remote-tracking branch 'origin/feature/0427-school' into feature/0427-school

.idea/httpRequests/http-requests-log.http

@@ -1,3 +1,63 @@
+GET http://127.0.0.1:8005/schoolStaff/cooperation
+Authorization: bearer 66862b1d-938b-467e-b7c9-65f77f0e7347
+tenantId: 1
+coopId: 14
+Connection: Keep-Alive
+User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
+Accept-Encoding: br,deflate,gzip,x-gzip
+
+<> 2023-05-25T181738.200.json
+
+###
+
+GET http://127.0.0.1:8005/schoolStaff/cooperation
+Authorization: bearer 66862b1d-938b-467e-b7c9-65f77f0e7347
+tenantId: 1
+coopId: 14
+Connection: Keep-Alive
+User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
+Accept-Encoding: br,deflate,gzip,x-gzip
+
+<> 2023-05-25T181606.200.json
+
+###
+
+GET http://127.0.0.1:8005/schoolStaff/cooperation
+Authorization: bearer 66862b1d-938b-467e-b7c9-65f77f0e7347
+tenantId: 1
+coopId: 14
+Connection: Keep-Alive
+User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
+Accept-Encoding: br,deflate,gzip,x-gzip
+
+<> 2023-05-25T180935.200.json
+
+###
+
+GET http://127.0.0.1:8005/schoolStaff/cooperation
+Authorization: bearer 66862b1d-938b-467e-b7c9-65f77f0e7347
+tenantId: 1
+coopId: 14
+Connection: Keep-Alive
+User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
+Accept-Encoding: br,deflate,gzip,x-gzip
+
+<> 2023-05-25T180923.200.json
+
+###
+
+GET http://127.0.0.1:8005/schoolStaff/cooperation
+Authorization: bearer 3f804d4e-b7f0-41ad-8dbf-119a0c54becc
+tenantId: 1
+coopId: 1
+Connection: Keep-Alive
+User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
+Accept-Encoding: br,deflate,gzip,x-gzip
+
+<> 2023-05-25T180355.200.json
+
+###
+
 POST http://127.0.0.1:8005/imGroup/schoolQueryFriendList
 Authorization: bearer 07bef4ad-6d9e-46e0-8fd3-c24a2fd11332
 Content-Type: application/json
@@ -552,48 +612,3 @@ Accept-Encoding: br,deflate,gzip,x-gzip
 
 ###
 
-GET http://127.0.0.1:9001/open/liveBroadcastRoom/visitorCredentials?roomUid=LIVE-2248475-1683777517444&fingerprint=111111112
-Proxy-Connection: Keep-Alive
-User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
-Accept-Encoding: br,deflate,gzip,x-gzip
-
-<> 2023-05-11T204644.200.json
-
-###
-
-GET http://127.0.0.1:9001/open/liveBroadcastRoom/visitorJoinRoom?roomUid=LIVE-2248475-1683777517444&userId=10000
-Proxy-Connection: Keep-Alive
-User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
-Accept-Encoding: br,deflate,gzip,x-gzip
-
-<> 2023-05-11T204620.200.json
-
-###
-
-GET http://127.0.0.1:9001/open/liveBroadcastRoom/visitorRoomInfo?roomUid=LIVE-2248475-1683777517444&userId=10000
-Proxy-Connection: Keep-Alive
-User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
-Accept-Encoding: br,deflate,gzip,x-gzip
-
-<> 2023-05-11T204529.200.json
-
-###
-
-GET http://127.0.0.1:9001/open/liveBroadcastRoom/visitorCredentials?roomUid=LIVE-2248475-1683777517444&fingerprint=111111111
-Proxy-Connection: Keep-Alive
-User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
-Accept-Encoding: br,deflate,gzip,x-gzip
-
-<> 2023-05-11T204510.200.json
-
-###
-
-GET http://127.0.0.1:9001/open/liveBroadcastRoom/visitorCredentials?roomUid=LIVE-2248475-1683777517444&fingerprint=111111112
-Proxy-Connection: Keep-Alive
-User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
-Accept-Encoding: br,deflate,gzip,x-gzip
-
-<> 2023-05-11T203037.200.json
-
-###
-

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/SchoolStaffServiceImpl.java

@@ -13,6 +13,7 @@ import com.ym.mec.biz.dal.dao.*;
 import com.ym.mec.biz.dal.entity.*;
 import com.ym.mec.biz.dal.enums.MessageTypeEnum;
 import com.ym.mec.biz.dal.enums.MusicGroupStatusEnum;
+import com.ym.mec.biz.dal.enums.StudentMusicGroupStatusEnum;
 import com.ym.mec.biz.dal.enums.school.ESchoolStaffType;
 import com.ym.mec.biz.dal.mapper.SchoolStaffMapper;
 import com.ym.mec.biz.dal.wrapper.SchoolStaffWrapper;
@@ -570,6 +571,7 @@ public class SchoolStaffServiceImpl extends ServiceImpl<SchoolStaffMapper, Schoo
         // 学校乐团统计
         int orchestraNums = musicGroupDao.countMusicGroups(paramMap);
 
+        paramMap.put("studentStatus", StudentMusicGroupStatusEnum.NORMAL);
         // 学校在读学生
         int studentNums = studentDao.countMusicGroupStudents(paramMap);
 

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

@@ -1087,6 +1087,9 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
         studentRegistration.setUpdateTime(date);
 
         SysUser sysUser = studentRegistrationDao.getSysUserByPhone(studentRegistration.getParentsPhone());
+        if (sysUser !=null && sysUser.getUserType().contains("SCHOOL")) {
+            throw new BizException("用户已存在学校账户");
+        }
         StudentRegistration phoneAndMusicGroupId = null;
         if (sysUser != null) {
             if (!musicGroup.getTenantId().equals(sysUser.getTenantId())) {

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

@@ -1149,6 +1149,9 @@ public class StudentServiceImpl extends BaseServiceImpl<Integer, Student> implem
     public <T extends BaseStudentDto> SysUser upSetStudent(T baseStudent) {
         // 判断用户是否存在
         SysUser user = studentDao.getUserByPhone(baseStudent.getPhone());
+        if (user !=null && user.getUserType().contains("SCHOOL")) {
+            throw new BizException("用户已存在学校账户");
+        }
         if (user == null || user.getId() == null) {
             user = new SysUser();
             BeanUtils.copyProperties(baseStudent,user);
@@ -1402,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());
@@ -1436,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/java/com/ym/mec/biz/service/impl/SysNewsInformationServiceImpl.java

@@ -58,7 +58,7 @@ public class SysNewsInformationServiceImpl extends ServiceImpl<SysNewsInformatio
                 .eq(SysNewsInformation::getType, type)
                 .eq(SysNewsInformation::getStatus, 1)
                 .eq(SysNewsInformation::getDelFlag, false)
-                .orderByAsc(SysNewsInformation::getOrder).list();
+                .orderByDesc(SysNewsInformation::getOrder).list();
         List<NewsInformationDto> resultList = new ArrayList<>();
         if(CollectionUtils.isNotEmpty(dtos)){
             List<String> musicGroupIds = musicGroupDao.findNormalByCooperationId(coopId);

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

@@ -223,8 +223,5 @@
         FROM cooperation_organ
         WHERE FIND_IN_SET(organ_id_, #{organId})
           AND del_flag_ != 1
-        <if test="enable != null">
-            AND is_enable_ = #{enable}
-        </if>
     </select>
 </mapper>

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/StudentMapper.xml

@@ -1400,6 +1400,9 @@
             <if test="schoolId != null">
                 AND t1.cooperation_organ_id_ = #{schoolId}
             </if>
+            <if test="studentStatus != null">
+                AND t2.music_group_status_ = #{studentStatus,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}
+            </if>
         </where>
     </select>
 </mapper>

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>