优化班级报告

sexam/src/main/java/com/xhkjedu/sexam/mapper/exam/EClassMapper.java

@@ -40,7 +40,7 @@ public interface EClassMapper extends TkMapper<EClass> {
     List<Map> listExamClassAndStu(@Param("examid") Integer examid);
 
     //教师权限下参加考试班级和学生
-    List<Map> listExamClassAndStuForTeacher(@Param("examid") Integer examid,@Param("teacherid") Integer teacherid);
+    List<Map> listExamClassAndStuForTeacher(@Param("examid") Integer examid,@Param("teacherid") Integer teacherid,@Param("schoolid") Integer schoolid);
 
     //班级选择列表
     List<Map> listBj(@Param("schoolid") Integer schoolid, @Param("teacherid") Integer teacherid);

sexam/src/main/java/com/xhkjedu/sexam/mapper/reportclass/EReportClassMapper.java

@@ -49,7 +49,7 @@ public interface EReportClassMapper {
     List<Map> listExamSubject(@Param("examid") Integer examid,@Param("teacherid") Integer teacherid);
 
     //教师考试权限班级
-    List<Map> listExamClass(@Param("examid") Integer examid,@Param("teacherid") Integer teacherid);
+    List<Map> listExamClass(@Param("examid") Integer examid,@Param("teacherid") Integer teacherid,@Param("schoolid") Integer schoolid);
 
     //根据考试id班级id获取班级名称
     String getClassNameByExamIdCid(@Param("examid")Integer examid,@Param("classid") Integer classid);

sexam/src/main/java/com/xhkjedu/sexam/service/report/EReportClassService.java

@@ -365,7 +365,9 @@ public class EReportClassService {
 
     //考试班级--教师权限下
     public List<Map> listExamQxClassTeacher(ReportParamsVo paramsVo){
-        return eReportClassMapper.listExamClass(paramsVo.getExamid(), paramsVo.getTeacherid());
+        Integer schoolid = userMapper.getSchoolidByUserid(paramsVo.getTeacherid());
+        paramsVo.setSchoolid(schoolid);
+        return eReportClassMapper.listExamClass(paramsVo.getExamid(), paramsVo.getTeacherid(),paramsVo.getSchoolid());
     }
 
     //教师考试权限科目
@@ -386,7 +388,8 @@ public class EReportClassService {
         Map map = eBaseMapper.findById(examid);
         List<Map> subjects = eReportClassMapper.listExamSubject(examid, teacherid);
         map.put("subjects", subjects);
-        List<Map> classes = eReportClassMapper.listExamClass(examid, teacherid);
+        Integer schoolid = userMapper.getSchoolidByUserid(teacherid);
+        List<Map> classes = eReportClassMapper.listExamClass(examid, teacherid,schoolid);
         map.put("classes", classes);
         return map;
     }

sexam/src/main/java/com/xhkjedu/sexam/service/report/EReportStudentService.java

@@ -9,6 +9,7 @@ import com.xhkjedu.sexam.mapper.paper.EPaperFileMapper;
 import com.xhkjedu.sexam.mapper.paper.EPaperMapper;
 import com.xhkjedu.sexam.mapper.reportclass.ERclassRankMapper;
 import com.xhkjedu.sexam.mapper.reportstu.ERstudentMapper;
+import com.xhkjedu.sexam.mapper.system.UserMapper;
 import com.xhkjedu.sexam.model.exam.EBase;
 import com.xhkjedu.sexam.utils.ExamUtil;
 import com.xhkjedu.sexam.vo.report.ERankParamVo;
@@ -44,6 +45,8 @@ public class EReportStudentService {
     private EPaperAnalyzeMapper ePaperAnalyzeMapper;
     @Resource
     private ERclassRankMapper eRclassRankMapper;
+    @Resource
+    private UserMapper userMapper;
 
     /**
      * @Description 获取考试基本信息（科目、班级、班级下学生）
@@ -65,7 +68,11 @@ public class EReportStudentService {
         Map map = eBaseMapper.findById(examid);
         List<Map> subjects = eSubjectMapper.listSubjectAndPnum(examid);
         map.put("subjects", subjects);
-        List<Map> classes = eClassMapper.listExamClassAndStuForTeacher(examid,userid);
+
+        //获取当前用户所属学校id
+        Integer schoolid = userMapper.getSchoolidByUserid(userid);
+
+        List<Map> classes = eClassMapper.listExamClassAndStuForTeacher(examid,userid,schoolid);
         map.put("classes", classes);
         return map;
     }

sexam/src/main/java/com/xhkjedu/sexam/vo/report/ERankParamVo.java

@@ -34,4 +34,6 @@ public class ERankParamVo {
     private List<ERrank> rranks;//等级
 
     private Integer showrank;//显示排名得分0保密1分数2分数+班排名3分数+班/校排名
+
+    private Integer schoolid;
 }

sexam/src/main/resources/mapper/exam/EClassMapper.xml

@@ -95,7 +95,7 @@
         left join t_user u on ps.studentid=u.userid
         left join t_class_teacher ct on c.classid=ct.classid
         left join t_class tc on c.classid = tc.classid
-        where c.examid=#{examid} and ct.teacherid=#{teacherid}
+        where c.examid=#{examid} and ct.teacherid=#{teacherid} and c.schoolid=#{schoolid}
         group by ps.studentid order by tc.classtype,tc.classorder,c.ecid, ps.studentid
     </select>
     <!--班级选择列表-->

sexam/src/main/resources/mapper/report/EReportClassMapper.xml

@@ -173,7 +173,7 @@
         select ec.classid,ec.classname,ec.classnum
         from e_class ec left join t_class_teacher ct on ec.classid = ct.classid
         left join t_class c on ec.classid=c.classid
-        where ec.examid=#{examid} and ct.teacherid=#{teacherid}
+        where ec.examid=#{examid} and ct.teacherid=#{teacherid} and ec.schoolid=#{schoolid}
         group by ec.classid order by c.classtype,c.classorder,ec.ecid
     </select>
     <!--根据考试id班级id获取班级名称-->