Merge branch 'cooperation_education' of http://git.dayaedu.com/yonge/mec

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

@@ -401,6 +401,13 @@ public interface MusicGroupDao extends BaseDAO<String, MusicGroup> {
      * @param cooperationOrganId
      * @return
      */
+    List<MusicGroup> findByCooperationIdAndStatus(Integer cooperationOrganId);
+
+    /**
+     * 根据合作单位获取乐团列表
+     * @param cooperationOrganId
+     * @return
+     */
     List<MusicGroup> findByCooperationId(Integer cooperationOrganId);
 
     /**

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

@@ -55,21 +55,9 @@ public class CooperationOrganServiceImpl extends BaseServiceImpl<Integer, Cooper
 		//修改了乐团主管后，修改关联乐团的乐团主管
 		if(!cooperationOrgan.getEducationUserId().equals(cooperationOrgan1.getEducationUserId())){
 			//获取进行中和暂停的乐团列表
-			List<MusicGroup> musicGroups = musicGroupDao.findByCooperationId(cooperationOrgan.getId());
+			List<MusicGroup> musicGroups = musicGroupDao.findByCooperationIdAndStatus(cooperationOrgan.getId());
 			if(musicGroups.size() > 0){
 				for (MusicGroup musicGroup : musicGroups) {
-					//乐团主管有变更
-					if(!cooperationOrgan.getEducationUserId().equals(musicGroup.getEducationalTeacherId())){
-						//不是导入的乐团
-						if(musicGroup.getId().length() > 10){
-							//是否有预报名的群聊
-							ImGroup imGroup = imGroupService.get(Long.parseLong(musicGroup.getId()));
-							if(imGroup != null){
-								imGroupMemberService.quit(Long.parseLong(musicGroup.getId()),musicGroup.getEducationalTeacherId());
-								imGroupMemberService.join(Long.parseLong(musicGroup.getId()),cooperationOrgan.getEducationUserId(),"乐团主管",false);
-							}
-						}
-					}
 					//获取当前乐团所有班级
 					List<ClassGroup> classGroups = classGroupDao.findClassGroups(musicGroup.getId());
 					if (classGroups == null || classGroups.size() == 0) {
@@ -90,6 +78,24 @@ public class CooperationOrganServiceImpl extends BaseServiceImpl<Integer, Cooper
 					});
 				}
 			}
+			//更新预报名群信息
+			List<MusicGroup> musicGroupList = musicGroupDao.findByCooperationId(cooperationOrgan.getId());
+			if(musicGroupList.size() > 0){
+				for (MusicGroup musicGroup : musicGroupList) {
+					//乐团主管有变更
+					if(!cooperationOrgan.getEducationUserId().equals(musicGroup.getEducationalTeacherId())){
+						//不是导入的乐团
+						if(musicGroup.getId().length() > 10){
+							//是否有预报名的群聊
+							ImGroup imGroup = imGroupService.get(Long.parseLong(musicGroup.getId()));
+							if(imGroup != null){
+								imGroupMemberService.quit(Long.parseLong(musicGroup.getId()),musicGroup.getEducationalTeacherId());
+								imGroupMemberService.join(Long.parseLong(musicGroup.getId()),cooperationOrgan.getEducationUserId(),"乐团主管",false);
+							}
+						}
+					}
+				}
+			}
 			//修改乐团主管
 			musicGroupDao.batchUpdateEdu(cooperationOrgan.getId(),cooperationOrgan.getEducationUserId());
 		}

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

@@ -743,6 +743,9 @@
         AND mg.educational_teacher_id_ IS NOT NULL
     </select>
     <select id="findByCooperationId" resultMap="MusicGroup">
+        SELECT * FROM music_group WHERE cooperation_organ_id_ = #{cooperationOrganId}
+    </select>
+    <select id="findByCooperationIdAndStatus" resultMap="MusicGroup">
         SELECT * FROM music_group WHERE cooperation_organ_id_ = #{cooperationOrganId} AND status_ IN ('PROGRESS','PAUSE')
     </select>
 </mapper>