增加查询老师的课程信息

mec-web/src/main/java/com/ym/mec/web/controller/TeacherController.java

@@ -1,8 +1,12 @@
 package com.ym.mec.web.controller;
 
 import com.ym.mec.common.controller.BaseController;
+import com.ym.mec.common.security.AuthUser;
+import com.ym.mec.common.security.SecurityUtils;
+import com.ym.mec.web.dal.entity.ClassGroup;
 import com.ym.mec.web.dal.entity.Teacher;
 import com.ym.mec.web.dal.page.TeacherQueryInfo;
+import com.ym.mec.web.service.ClassGroupService;
 import com.ym.mec.web.service.TeacherService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -11,6 +15,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.Date;
+import java.util.List;
 
 @RequestMapping("teacher")
 @Api(tags = "教师服务")
@@ -20,6 +25,9 @@ public class TeacherController extends BaseController {
     @Autowired
     private TeacherService teacherService;
 
+    @Autowired
+    private ClassGroupService classGroupService;
+
     @ApiOperation(value = "新增教师")
     @PostMapping("/add")
     public Object add(@RequestBody Teacher teacher) {
@@ -64,4 +72,10 @@ public class TeacherController extends BaseController {
     public Object queryPage(@RequestBody TeacherQueryInfo queryInfo) {
         return succeed(teacherService.queryPage(queryInfo));
     }
+
+    @ApiOperation(value = "根据教师编号查询教师课程班列表")
+    @GetMapping("/getclass/{id}")
+    public Object getClassGroup(@ApiParam(value = "教师编号", required = true) @PathVariable("id") Integer id) {
+        return succeed(classGroupService.findClassGroup4Teacher(id));
+    }
 }

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

@@ -1,4 +1,6 @@
 package com.ym.mec.web.dal.dao;
+import java.util.Date;
+import com.ym.mec.web.dal.enums.ClassGroupTypeEnum;
 
 import com.ym.mec.common.dal.BaseDAO;
 import com.ym.mec.web.dal.entity.ClassGroup;
@@ -14,6 +16,6 @@ public interface ClassGroupDao extends BaseDAO<Integer, ClassGroup> {
      * @param teacherId
      * @return
      */
-    List<ClassGroup> findClassGroup4Teacher(@Param("teacherId") int teacherId);
+    List<ClassGroup> findClassGroup4Teacher(@Param("teacherId") Integer teacherId);
 
 }

mec-web/src/main/java/com/ym/mec/web/dal/entity/ClassGroup4Teacher.java

@@ -0,0 +1,39 @@
+package com.ym.mec.web.dal.entity;
+
+import com.ym.mec.web.dal.enums.MusicGroupStatusEnum;
+import io.swagger.annotations.ApiModelProperty;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+
+/**
+ * 对应数据库表(class_group):
+ */
+public class ClassGroup4Teacher extends ClassGroup{
+
+	@ApiModelProperty(value = "乐团名称",required = false)
+	private String musicGroupName;
+
+	@ApiModelProperty(value = "乐团状态",required = false)
+	private MusicGroupStatusEnum MusicGroupStatus;
+
+	public String getMusicGroupName() {
+		return musicGroupName;
+	}
+
+	public void setMusicGroupName(String musicGroupName) {
+		this.musicGroupName = musicGroupName;
+	}
+
+	public MusicGroupStatusEnum getMusicGroupStatus() {
+		return MusicGroupStatus;
+	}
+
+	public void setMusicGroupStatus(MusicGroupStatusEnum musicGroupStatus) {
+		MusicGroupStatus = musicGroupStatus;
+	}
+
+	@Override
+	public String toString() {
+		return ToStringBuilder.reflectionToString(this);
+	}
+
+}

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

@@ -12,5 +12,6 @@ public interface ClassGroupService extends BaseService<Integer, ClassGroup> {
      * @param teacherId
      * @return
      */
-    List<ClassGroup> findClassGroup4Teacher(int teacherId);
+    List<ClassGroup> findClassGroup4Teacher(Integer teacherId);
+
 }

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

@@ -23,7 +23,7 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
 	}
 
 	@Override
-    public List<ClassGroup> findClassGroup4Teacher(int teacherId) {
+    public List<ClassGroup> findClassGroup4Teacher(Integer teacherId) {
         return classGroupDao.findClassGroup4Teacher(teacherId);
     }
 }

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

@@ -17,8 +17,27 @@
         <result column="update_time_" property="updateTime"/>
         <result column="type_" property="type" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
         <result column="teacher_salary_" property="teacherSalary"/>
+        <association property="musicGroupId" javaType="com.ym.mec.web.dal.entity.MusicGroup" >
+            <result column="name_" property="name"/>
+            <result column="status_" property="status"/>
+        </association>
     </resultMap>
 
+    <resultMap type="com.ym.mec.web.dal.entity.ClassGroup4Teacher" id="ClassGroup4Teacher">
+        <result column="id_" property="id"/>
+        <result column="music_group_id_" property="musicGroupId"/>
+        <result column="subject_id_" property="subjectId"/>
+        <result column="name_" property="name"/>
+        <result column="student_num_" property="studentNum"/>
+        <result column="assistant_teacher_id_" property="assistantTeacherId"/>
+        <result column="main_teacher_id_" property="mainTeacherId"/>
+        <result column="create_time_" property="createTime"/>
+        <result column="update_time_" property="updateTime"/>
+        <result column="type_" property="type" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
+        <result column="teacher_salary_" property="teacherSalary"/>
+        <result column="name_" property="musicGroupName"/>
+        <result column="status" property="MusicGroupStatus" />
+    </resultMap>
 
     <insert id="insert" parameterType="com.ym.mec.web.dal.entity.ClassGroup" useGeneratedKeys="true" keyColumn="id"
             keyProperty="id">
@@ -114,7 +133,7 @@
 	</select>
 
     <!-- 查询根据主教助教查询班级信息 -->
-    <select id="findClassGroup4Teacher" resultMap="ClassGroup">
+    <select id="findClassGroup4Teacher" resultMap="ClassGroup4Teacher">
         SELECT
         c.*,
         m.*