Merge branch 'master' of https://gitee.com/zouxuan/mec

mec-web/src/main/java/com/ym/mec/web/dal/dao/ClassGroupDao.java

@@ -2,8 +2,17 @@ package com.ym.mec.web.dal.dao;
 
 import com.ym.mec.common.dal.BaseDAO;
 import com.ym.mec.web.dal.entity.ClassGroup;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 public interface ClassGroupDao extends BaseDAO<Integer, ClassGroup> {
 
-	
+
+    /**
+     * 查询老师乐团课课程
+     * @param teacherId
+     * @return
+     */
+    List<ClassGroup> findClassGroup4Teacher(@Param("teacherId") int teacherId);
 }

mec-web/src/main/java/com/ym/mec/web/service/ClassGroupService.java

@@ -3,6 +3,14 @@ package com.ym.mec.web.service;
 import com.ym.mec.common.service.BaseService;
 import com.ym.mec.web.dal.entity.ClassGroup;
 
+import java.util.List;
+
 public interface ClassGroupService extends BaseService<Integer, ClassGroup> {
 
+    /**
+     * 查询老师乐团课课程
+     * @param teacherId
+     * @return
+     */
+    List<ClassGroup> findClassGroup4Teacher(int teacherId);
 }

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

@@ -9,6 +9,8 @@ import com.ym.mec.web.dal.dao.ClassGroupDao;
 import com.ym.mec.web.dal.entity.ClassGroup;
 import com.ym.mec.web.service.ClassGroupService;
 
+import java.util.List;
+
 @Service
 public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>  implements ClassGroupService {
 	
@@ -19,5 +21,9 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
 	public BaseDAO<Integer, ClassGroup> getDAO() {
 		return classGroupDao;
 	}
-	
+
+	@Override
+    public List<ClassGroup> findClassGroup4Teacher(int teacherId) {
+        return classGroupDao.findClassGroup4Teacher(teacherId);
+    }
 }

mec-web/src/main/resources/config/mybatis/ClassGroupMapper.xml

@@ -22,8 +22,8 @@
 
     <!-- 根据主键查询一条记录 -->
     <select id="get" resultMap="ClassGroup">
-		SELECT * FROM class_group WHERE id_ = #{id} 
-	</select>
+        SELECT * FROM class_group WHERE id_ = #{id}
+    </select>
 
     <!-- 全查询 -->
     <select id="findAll" resultMap="ClassGroup">
@@ -80,8 +80,8 @@
 
     <!-- 根据主键删除一条记录 -->
     <delete id="delete">
-		DELETE FROM class_group WHERE id_ = #{id} 
-	</delete>
+        DELETE FROM class_group WHERE id_ = #{id}
+    </delete>
 
     <!-- 分页查询 -->
     <select id="queryPage" resultMap="ClassGroup" parameterType="map">
@@ -93,4 +93,17 @@
     <select id="queryCount" resultType="int">
 		SELECT COUNT(*) FROM class_group
 	</select>
+    <select id="findClassGroup4Teacher" resultMap="ClassGroup">
+        SELECT
+        c.*,
+        m.*
+        FROM
+        class_group c,
+        music_group m
+        WHERE
+        c.main_teacher_id_ = #{teacherId}
+        OR
+        c.assistant_teacher_id_ = #{teacherId}
+
+    </select>
 </mapper>