增加获取分部下所有的老师

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

@@ -17,25 +17,29 @@ public interface TeacherDao extends BaseDAO<Integer, Teacher> {
 
     /**
      * 根据证件号查询老师
-     * @param certificateNum  证件号
+     *
+     * @param certificateNum 证件号
      * @return Teacher 老师信息
      */
     Teacher findByCertificateNum(@Param("certificateNum") String certificateNum);
 
     /**
      * 修改用户信息
+     *
      * @param user
      */
     void updateUser(SysUser user);
 
     /**
      * 新增sysUser
+     *
      * @param user
      */
     void addSysUser(SysUser user);
 
     /**
      * 获取和当前教师相关的学员列表
+     *
      * @param teacherId
      * @param search
      * @return
@@ -44,8 +48,16 @@ public interface TeacherDao extends BaseDAO<Integer, Teacher> {
 
     /**
      * 根据用户编号列表获取用户名称
+     *
      * @param userIds
      * @return
      */
     List<Map<Integer, String>> queryNameByIds(@Param("userIds") Set<Integer> userIds);
+
+    /**
+     * 查询分部所有老师
+     * @param organId
+     * @return
+     */
+    List<Teacher> findTeachers(@Param("organId") Integer organId);
 }

mec-biz/src/main/java/com/ym/mec/biz/service/TeacherService.java

@@ -8,6 +8,7 @@ import com.ym.mec.common.entity.ImGroupModel;
 import com.ym.mec.common.page.PageInfo;
 import com.ym.mec.common.page.QueryInfo;
 import com.ym.mec.common.service.BaseService;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -68,4 +69,12 @@ public interface TeacherService extends BaseService<Integer, Teacher> {
      * @return
      */
     List<BasicUserDto> queryGroupStudents(Integer id, String search);
+
+    /**
+     * 查询分部所有老师
+     * @param organId
+     * @return
+     */
+    List<Teacher> findTeachers(@Param("organId") Integer organId);
+
 }

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

@@ -152,7 +152,12 @@ public class TeacherServiceImpl extends BaseServiceImpl<Integer, Teacher>  imple
 		return teacherDao.queryGroupStudents(teacherId,search);
 	}
 
-	@Override
+    @Override
+    public List<Teacher> findTeachers(Integer organId) {
+		return teacherDao.findTeachers(organId);
+    }
+
+    @Override
 	public PageInfo<Teacher> queryPageDetail(TeacherQueryInfo queryInfo) {
 		return queryPage(queryInfo);
 	}

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

@@ -259,7 +259,7 @@
     </resultMap>
     <!-- 根据乐团id获取乐团下所有班级 -->
     <select id="findClassGroupByMusicGroupId" resultMap="ClassGroupTeachers">
-        SELECT * FROM class_group WHERE music_group_id_ = #{musicGroupId} AND del_flag_ = 0;
+        SELECT * FROM class_group WHERE music_group_id_ = #{musicGroupId} AND AND del_flag_ = 0;
     </select>
 
     <resultMap type="com.ym.mec.biz.dal.dto.CourseListDto" id="CourseListDto">

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

@@ -12,7 +12,8 @@
         <result column="organ_name_" property="organName"/>
         <result column="job_type_" property="jobType"/>
         <result column="job_nature_" property="jobNature"/>
-        <result column="is_probation_period_" property="isProbationPeriod" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
+        <result column="is_probation_period_" property="isProbationPeriod"
+                typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
         <result column="education_background_" property="educationBackground"/>
         <result column="graduate_school_" property="graduateSchool"/>
         <result column="technical_titles_" property="technicalTitles"/>
@@ -29,6 +30,7 @@
 
         <result column="username_" property="username"/>
         <result column="password_" property="password"/>
+        <result column="real_name_" property="realName"/>
         <result column="salt_" property="salt"/>
         <result column="phone_" property="phone"/>
         <result column="avatar_" property="avatar"/>
@@ -47,19 +49,21 @@
 
     <!-- 根据主键查询一条记录 -->
     <select id="get" resultMap="Teacher">
-		SELECT t.*,su.username_,su.password_,su.salt_,su.phone_,su.avatar_,
+        SELECT t.*,su.username_,su.password_,su.salt_,su.phone_,su.avatar_,
         su.lock_flag_,su.del_flag_,su.wx_openid_,su.qq_openid_,su.user_type_,
         su.gender_,su.nation_,su.birthdate_,su.email_,su.im_token_,t.subject_id_,t.organ_id_,o.name_ organ_name_
         FROM teacher t
         LEFT JOIN sys_user su ON t.id_ = su.id_
         LEFT JOIN organization o ON t.organ_id_ = o.id_
         WHERE t.id_ = #{userId} AND o.del_flag_ = 0
-	</select>
+    </select>
 
     <!-- 全查询 -->
     <select id="findAll" resultMap="Teacher">
-		SELECT * FROM teacher ORDER BY user_id_
-	</select>
+        SELECT *
+        FROM teacher
+        ORDER BY user_id_
+    </select>
 
     <!-- 向数据库增加一条记录 -->
     <insert id="insert" parameterType="com.ym.mec.biz.dal.entity.Teacher" useGeneratedKeys="true" keyColumn="id"
@@ -135,8 +139,8 @@
 
     <!-- 根据主键删除一条记录 -->
     <update id="delete">
-		DELETE FROM teacher WHERE user_id_ = #{userId}
-	</update>
+        DELETE FROM teacher WHERE user_id_ = #{userId}
+    </update>
 
     <update id="updateUser" parameterType="com.ym.mec.auth.api.entity.SysUser">
         UPDATE sys_user
@@ -197,7 +201,8 @@
     <select id="queryPage" resultMap="Teacher" parameterType="map">
         SELECT t.*,su.username_,su.password_,su.salt_,su.phone_,su.avatar_,
         su.lock_flag_,su.del_flag_,su.wx_openid_,su.qq_openid_,su.user_type_,
-        su.gender_,su.nation_,su.birthdate_,su.email_,su.im_token_,t.subject_id_,t.organ_id_,o.name_ organ_name_,s.name_ subject_name_
+        su.gender_,su.nation_,su.birthdate_,su.email_,su.im_token_,t.subject_id_,t.organ_id_,o.name_ organ_name_,s.name_
+        subject_name_
         FROM teacher t
         LEFT JOIN sys_user su ON t.id_ = su.id_
         LEFT JOIN organization o ON t.organ_id_ = o.id_
@@ -233,12 +238,12 @@
         LEFT JOIN `subject` s ON t.subject_id_ = s.id_
         LEFT JOIN organization o ON t.organ_id_ = o.id_
         <include refid="queryPageMap"/>
-	</select>
+    </select>
 
     <!-- 根据证件号查询老师 -->
     <select id="findByCertificateNum" resultMap="Teacher">
-		SELECT * FROM teacher WHERE certificate_num_ = #{certificateNum}
-	</select>
+        SELECT * FROM teacher WHERE certificate_num_ = #{certificateNum}
+    </select>
     <select id="queryGroupStudents" resultMap="com.ym.mec.biz.dal.dao.MusicGroupDao.BasicUserDto">
         SELECT su.username_,su.id_ user_id_,su.avatar_ head_url_,su.gender_,s.name_ FROM class_group_teacher_mapper cgtm
         LEFT JOIN class_group_student_mapper cgsm ON cgtm.class_group_id_ = cgsm.class_group_id_
@@ -256,4 +261,12 @@
             #{item}
         </foreach>
     </select>
+
+    <select id="findTeachers" resultMap="Teacher">
+        SELECT su.* FROM teacher t
+        LEFT JOIN sys_user su on t.id_ = su.id_ WHERE 1=1
+        <if test="organId != null and organId !=0">
+            AND t.organ_id_ = #{organId}
+        </if>
+    </select>
 </mapper>

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

@@ -9,6 +9,7 @@ import com.ym.mec.biz.dal.page.VipClassQueryInfo;
 import com.ym.mec.biz.service.ClassGroupService;
 import com.ym.mec.biz.service.TeacherService;
 import com.ym.mec.common.controller.BaseController;
+import com.ym.mec.common.entity.HttpResponseResult;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -83,34 +84,42 @@ public class TeacherController extends BaseController {
     @ApiOperation(value = "获取老师乐团课程信息列表")
     @GetMapping("/getTeacherMusicClass")
     @ApiParam(value = "教师编号", required = true)
-    public Object getTeacherMusicClass(Integer teacherId){
+    public Object getTeacherMusicClass(Integer teacherId) {
         return succeed(classGroupService.getTeacherMusicClass(teacherId));
     }
 
     @ApiOperation(value = "获取老师VIP课程信息列表")
     @GetMapping("/getTeacherVipClass")
-    public Object getTeacherVipClass(VipClassQueryInfo queryInfo){
+    public Object getTeacherVipClass(VipClassQueryInfo queryInfo) {
         return succeed(classGroupService.getTeacherVipClass(queryInfo));
     }
 
     @ApiOperation(value = "获取教师所有聊天群组")
     @GetMapping("/queryTeacherGroups")
-    public Object queryTeacherGroups(String search){
+    public Object queryTeacherGroups(String search) {
         SysUser sysUser = sysUserFeignService.queryUserInfo();
-        if(sysUser == null){
+        if (sysUser == null) {
             return failed("获取用户信息失败");
         }
-        return succeed(teacherService.queryTeacherGroups(sysUser.getId(),search));
+        return succeed(teacherService.queryTeacherGroups(sysUser.getId(), search));
     }
 
     @ApiOperation(value = "获取和当前教师相关的所有学员聊天列表")
     @GetMapping("/queryGroupStudents")
-    public Object queryGroupStudents(String search){
+    public Object queryGroupStudents(String search) {
         SysUser sysUser = sysUserFeignService.queryUserInfo();
-        if(sysUser == null){
+        if (sysUser == null) {
             return failed("获取用户信息失败");
         }
-        return succeed(teacherService.queryGroupStudents(sysUser.getId(),search));
+        return succeed(teacherService.queryGroupStudents(sysUser.getId(), search));
+    }
+
+
+    @ApiOperation(value = "获取分部所有老师")
+    @GetMapping("/findTeachers")
+    public HttpResponseResult findTeachers() {
+        Integer organId = sysUserFeignService.queryUserInfo().getOrganId();
+        return succeed(teacherService.findTeachers(organId));
     }
 
 }