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

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

@@ -408,7 +408,7 @@ public interface MusicGroupDao extends BaseDAO<String, MusicGroup> {
      * @param cooperationOrganId
      * @return
      */
-    List<MusicGroup> findByCooperationId(Integer cooperationOrganId);
+    List<MusicGroup> findByCooperationId(@Param("cooperationId") Integer cooperationOrganId, @Param("musicStatus") String musicStatus);
 
     /**
      * 批量修改乐团主管

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

@@ -79,7 +79,7 @@ public class CooperationOrganServiceImpl extends BaseServiceImpl<Integer, Cooper
 				}
 			}
 			//更新预报名群信息
-			List<MusicGroup> musicGroupList = musicGroupDao.findByCooperationId(cooperationOrgan.getId());
+			List<MusicGroup> musicGroupList = musicGroupDao.findByCooperationId(cooperationOrgan.getId(),null);
 			if(musicGroupList.size() > 0){
 				for (MusicGroup musicGroup : musicGroupList) {
 					//不是导入的乐团

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

@@ -743,7 +743,10 @@
         AND mg.educational_teacher_id_ IS NOT NULL
     </select>
     <select id="findByCooperationId" resultMap="MusicGroup">
-        SELECT * FROM music_group WHERE cooperation_organ_id_ = #{cooperationOrganId}
+        SELECT * FROM music_group WHERE cooperation_organ_id_ = #{cooperationId}
+        <if test="musicStatus != null">
+            AND status_ = #{musicStatus}
+        </if>
     </select>
     <select id="findByCooperationIdAndStatus" resultMap="MusicGroup">
         SELECT * FROM music_group WHERE cooperation_organ_id_ = #{cooperationOrganId} AND status_ IN ('PROGRESS','PAUSE','PREPARE')