教师权限年级下班级

班级任教老师及科目

suser/src/main/java/com/xhkjedu/suser/controller/gradeclass/ClassController.java

@@ -2,6 +2,7 @@ package com.xhkjedu.suser.controller.gradeclass;
 
 import com.xhkjedu.suser.model.gradeclass.TClass;
 import com.xhkjedu.suser.service.gradeclass.ClassService;
+import com.xhkjedu.suser.vo.gradeclass.ClassTeacherSubjectVo;
 import com.xhkjedu.utils.N_Utils;
 import com.xhkjedu.vo.ResultVo;
 import com.xhkjedu.suser.vo.gradeclass.ClassVo;
@@ -71,7 +72,7 @@ public class ClassController {
     public ResultVo listTeacher(@RequestBody TClass tClass) {
         Integer classid = tClass.getClassid();
         N_Utils.validation(new Object[]{classid, "班级id", 1});
-        List<String> list = classService.listTeacher(classid);
+        List<ClassTeacherSubjectVo> list = classService.listTeacher(classid);
         return new ResultVo(0, "获取任教老师列表成功", list);
     }
 

suser/src/main/java/com/xhkjedu/suser/controller/system/TeacherRoleController.java

@@ -126,4 +126,19 @@ public class TeacherRoleController {
         return new ResultVo(0,"获取教师权限班级列表成功",list);
     }
 
+    /**
+     * @Description 获取教师权限年级下所有班级
+     * @Param [trole]
+     * @Return com.xhkjedu.vo.ResultVo
+     * @Author wn
+     * @Date 2022/6/28 9:33
+     **/
+    @PostMapping("/list_allclass")
+    public ResultVo listRoleGradeAllClass(@RequestBody TeacherRoleParam trole){
+        Integer teacherid = trole.getTeacherid();
+        N_Utils.validation(new Object[]{teacherid,"教师id",1});
+        List<GradeVo> list = teacherRoleService.listRoleGradeAllClass(trole);
+        return new ResultVo(0,"获取教师权限年级下班级列表成功",list);
+    }
+
 }

suser/src/main/java/com/xhkjedu/suser/mapper/gradeclass/ClassMapper.java

@@ -2,6 +2,7 @@ package com.xhkjedu.suser.mapper.gradeclass;
 
 import com.xhkjedu.suser.base.TkMapper;
 import com.xhkjedu.suser.model.gradeclass.TClass;
+import com.xhkjedu.suser.vo.gradeclass.ClassTeacherSubjectVo;
 import com.xhkjedu.suser.vo.gradeclass.ClassVo;
 import org.apache.ibatis.annotations.Param;
 
@@ -27,7 +28,7 @@ public interface ClassMapper extends TkMapper<TClass> {
     TClass getByName(@Param("tClass") TClass tClass);
 
     //获取任教老师列表
-    List<String> listTeacher(@Param("classid") Integer classid);
+    List<ClassTeacherSubjectVo> listTeacher(@Param("classid") Integer classid);
 
     //修改单个班级状态
     Integer updateClassstateByClassid(@Param("classid") Integer classid, @Param("classstate") Integer classstate);

suser/src/main/java/com/xhkjedu/suser/mapper/gradeclass/ClassTeacherMapper.java

@@ -87,4 +87,13 @@ public interface ClassTeacherMapper extends TkMapper<TClassTeacher> {
      * @date 2022/5/5 11:29
      */
     List<Map> listTeahcersBySubjectGrade2(@Param("ctp") ClassTeacherParams ctp);
+
+    /**
+     * @Description 获取教师权限年级下所有班级
+     * @Param [role]
+     * @Return java.util.List<com.xhkjedu.suser.vo.gradeclass.GradeVo>
+     * @Author wn
+     * @Date 2022/6/28 9:32
+     **/
+    List<GradeVo> listRoleGradeAllClass(@Param("role")TeacherRoleParam role);
 }

suser/src/main/java/com/xhkjedu/suser/mapper/gradeclass/SchoolMapper.java

@@ -1,5 +1,9 @@
 package com.xhkjedu.suser.mapper.gradeclass;
 
+import com.xhkjedu.suser.model.gradeclass.TSchool;
+import org.springframework.stereotype.Repository;
+
+@Repository
 public interface SchoolMapper {
     //获取学校当前年份
     Integer getYearById(Integer schoolid);
@@ -9,4 +13,7 @@ public interface SchoolMapper {
 
     //获取学校账号数量
     Integer getUserNumById(Integer schoolid);
+
+    //更加用户id获取当前学校id和年份
+    TSchool getSchoolInfoByUserid(Integer userid);
 }

suser/src/main/java/com/xhkjedu/suser/service/gradeclass/ClassService.java

@@ -4,6 +4,7 @@ import com.xhkjedu.suser.mapper.gradeclass.ClassMapper;
 import com.xhkjedu.suser.mapper.gradeclass.SchoolMapper;
 import com.xhkjedu.suser.model.gradeclass.TClass;
 import com.xhkjedu.suser.model.gradeclass.TGroup;
+import com.xhkjedu.suser.vo.gradeclass.ClassTeacherSubjectVo;
 import com.xhkjedu.suser.vo.gradeclass.ClassVo;
 import com.xhkjedu.utils.N_Utils;
 import com.xhkjedu.vo.ResultVo;
@@ -70,7 +71,7 @@ public class ClassService {
     }
 
     //获取任教老师列表
-    public List<String> listTeacher(Integer classid) {
+    public List<ClassTeacherSubjectVo> listTeacher(Integer classid) {
         return classMapper.listTeacher(classid);
     }
 

suser/src/main/java/com/xhkjedu/suser/service/system/TeacherRoleService.java

@@ -7,6 +7,7 @@ import com.xhkjedu.suser.mapper.subjectbook.TeacherSubjectbookMapper;
 import com.xhkjedu.suser.mapper.system.UserModuleMapper;
 import com.xhkjedu.suser.mapper.system.UserRoleMapper;
 import com.xhkjedu.suser.model.gradeclass.TClassTeacher;
+import com.xhkjedu.suser.model.gradeclass.TSchool;
 import com.xhkjedu.suser.model.subjectbook.TTeacherPowersb;
 import com.xhkjedu.suser.model.system.TUserRole;
 import com.xhkjedu.suser.vo.gradeclass.ClassVo;
@@ -50,7 +51,7 @@ public class TeacherRoleService {
 
     @Autowired
     private UserModuleMapper userModuleMapper;
-    @Resource
+    @Autowired
     private SchoolMapper schoolMapper;
 
     /**
@@ -220,4 +221,18 @@ public class TeacherRoleService {
         role.setYear(year);
         return classTeacherMapper.listGradeClassesByUserid2(role);
     }
+
+    /**
+     * @Description 获取教师权限年级下所有班级
+     * @Param [trole]
+     * @Return java.util.List<com.xhkjedu.suser.vo.gradeclass.GradeVo>
+     * @Author wn
+     * @Date 2022/6/28 9:32
+     **/
+    public List<GradeVo> listRoleGradeAllClass(TeacherRoleParam trole) {
+        TSchool school = schoolMapper.getSchoolInfoByUserid(trole.getTeacherid());
+        trole.setYear(school.getYear());
+        trole.setSchoolid(school.getSchoolid());
+        return classTeacherMapper.listRoleGradeAllClass(trole);
+    }
 }

suser/src/main/java/com/xhkjedu/suser/vo/gradeclass/ClassTeacherSubjectVo.java

@@ -0,0 +1,16 @@
+package com.xhkjedu.suser.vo.gradeclass;
+
+import lombok.Data;
+
+/**
+ * @Description 班级任教教师及教师科目
+ * @Author WN
+ * Date 2022/6/28 10:31
+ **/
+@Data
+public class ClassTeacherSubjectVo {
+
+    private String teachername;
+
+    private String subjectname;
+}

suser/src/main/resources/application.properties

@@ -57,4 +57,4 @@ signName=【河南星火燎原】
 #郑州管城大数据SSO认证鉴权接口
 ssourl=http://gcdsj.zzgcjy.cn/portal/sso/api/agent
 #版本号
-versionname=Test_v3.2.11
+versionname=Test_v3.2.12

suser/src/main/resources/mapper/gradeclass/ClassMapper.xml

@@ -57,9 +57,12 @@
         and c.year=#{tClass.year} and c.gradeid=#{tClass.gradeid} and c.classstate=1 and c.classtype=#{tClass.classtype} limit 1
     </select>
     <!--获取任教老师列表-->
-    <select id="listTeacher" resultType="java.lang.String">
-        select u.username from t_class_teacher ct left join t_user u on ct.teacherid=u.userid
-        where ct.classid=#{classid} and u.userstate=1
+    <select id="listTeacher" resultType="com.xhkjedu.suser.vo.gradeclass.ClassTeacherSubjectVo">
+        select u.username as teachername,s.subjectname from t_class_teacher ct left join t_user u on ct.teacherid=u.userid
+        left join t_teacher_powersb tp on ct.teacherid=tp.teacherid
+        left join t_subject_book sb on tp.lsbid=sb.lsbid
+        left join t_subject s on sb.subjectid=s.subjectid
+        where ct.classid=#{classid} and u.userstate=1 group by u.userid order by u.userid
     </select>
 
     <!--修改单个班级状态-->

suser/src/main/resources/mapper/gradeclass/ClassTeacherMapper.xml

@@ -210,4 +210,17 @@
         </if>
         group by ct.teacherid
     </select>
+
+    <!--获取教师权限年级下所有班级-->
+    <select id="listRoleGradeAllClass" resultMap="gradeClass">
+        select c.gradeid,c.classid,c.classname,c.classnum,c.classtype
+             ,(case c.gradeid when 1 then '一年级' when 2 then '二年级' when 3 then '三年级' when 4 then '四年级'
+                              when 5 then '五年级' when 6 then '六年级' when 7 then '七年级' when 8 then '八年级' when 9 then '九年级'
+                              when 10 then '高一' when 11 then '高二' when 12 then '高三' else '' end)gradename
+        from t_class c where c.schoolid=#{role.schoolid} and c.year=#{role.year} and c.classstate=1 and c.classtype in (1,2)
+        and c.gradeid=(
+        select c2.gradeid from t_class c2 left join t_class_teacher ct on c2.classid=ct.classid
+        where ct.teacherid=#{role.teacherid} and c2.year=#{role.year} and c2.classstate=1 and c2.classtype=1 limit 1)
+        order by c.classtype,c.classorder
+    </select>
 </mapper>

suser/src/main/resources/mapper/gradeclass/SchoolMapper.xml

@@ -14,4 +14,10 @@
     <select id="getUserNumById" resultType="java.lang.Integer">
         select usernum from t_school where schoolid=#{schoolid}
     </select>
+
+    <!--更加用户id获取当前学校id和年份-->
+    <select id="getSchoolInfoByUserid" resultType="com.xhkjedu.suser.model.gradeclass.TSchool">
+        select s.schoolid,s.year from t_user u left join t_school s on u.schoolid=s.schoolid
+        where u.userid=#{userid}
+    </select>
 </mapper>

suser/src/test/java/com/xhkjedu/suser/SuserApplicationTests.java

@@ -8,6 +8,7 @@ class SuserApplicationTests {
 
     @Test
     void contextLoads() {
+
     }
 
 }