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

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

@@ -27,8 +27,16 @@ public interface ClassGroupRelationDao extends BaseDAO<Integer, ClassGroupRelati
 
     /**
      * 根据子班id'查询父班id
+     *
      * @param subClassGroupId
      * @return
      */
     ClassGroupRelation findClassGroupRelation(@Param("subClassGroupId") Integer subClassGroupId);
+
+    /**
+     * 删除单技跟跟合奏班关系
+     * @param subClassGroupId
+     * @return
+     */
+    int deleteBySubClassId(@Param("classGroupId") Integer subClassGroupId);
 }

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

@@ -129,7 +129,7 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
         List<ClassGroup> allMixClassGroup = classGroupDao.findAllMixClassGroup(musicGroupId);
         for (ClassGroup mixClassGroup : allMixClassGroup) {
             ClassGroup mixClassChildClassGroup = classGroupDao.findMixClassChildClassGroupNames(mixClassGroup.getId());
-            if(mixClassChildClassGroup != null){
+            if (mixClassChildClassGroup != null) {
                 mixClassGroup.setClassNames(mixClassChildClassGroup.getName());
             }
         }
@@ -653,10 +653,7 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
         classGroupStudentMapperDao.deleteByClassId(classGroupId);
         studentRegistrationDao.deleteClassGroup(classGroupId);
         //删除班级跟合奏班关系
-        ClassGroupRelation classGroupRelation = classGroupRelationDao.findClassGroupRelation(classGroupId);
-        if(classGroupRelation != null){
-            classGroupRelationDao.delete(classGroupRelation.getId());
-        }
+        classGroupRelationDao.deleteBySubClassId(classGroupId);
         //删除班级
         classGroupDao.delete(classGroupId);
     }

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

@@ -83,4 +83,7 @@
     <select id="findClassGroupRelation" resultMap="ClassGroupRelation">
         SELECT * FROM class_group_relation WHERE sub_class_group_id_ = #{subClassGroupId}
     </select>
+    <delete id="deleteBySubClassId">
+        DELETE FROM class_group_relation WHERE sub_class_group_id_ = #{classGroupId}
+    </delete>
 </mapper>