考试管理集团校相关内容处理

sexam/src/main/java/com/xhkjedu/sexam/controller/exam/EBaseController.java

@@ -314,9 +314,10 @@ public class EBaseController {
     @PostMapping("/list_stu")
     public ResultVo listStu(@RequestBody EClassStudent cs) {
         Integer examid = cs.getExamid();
+        Integer schoolid = cs.getSchoolid();
         Integer page = cs.getPage();
         Integer pageSize = cs.getPageSize();
-        N_Utils.validation(new Object[]{examid, "考试id", 1});
+        N_Utils.validation(new Object[]{examid, "考试id", 1,schoolid,"学校id",1});
         if (N_Utils.isEmptyInteger(page)) {
             List<Map> list = eBaseService.listStu(cs);
             return new ResultVo(0, "获取考试学生成功", list);
@@ -510,8 +511,9 @@ public class EBaseController {
     @PostMapping("/list_qkd")
     public ResultVo listQkDetail(@RequestBody EPaperVo vo) {
         Integer epid = vo.getEpid();
-        N_Utils.validation(new Object[]{epid, "试卷id", 1});
-        List<Map> list = eBaseService.listQkDetail(epid);
+        Integer schoolid = vo.getSchoolid();
+        N_Utils.validation(new Object[]{epid, "试卷id", 1,schoolid,"学校id",1});
+        List<Map> list = eBaseService.listQkDetail(epid,schoolid);
         return new ResultVo(0, "获取缺考详情成功", list);
     }
 
@@ -529,6 +531,20 @@ public class EBaseController {
         return new ResultVo(0, "设置成功");
     }
 
+    /*
+     * @Description 获取考试关联学校
+     * @Date 2023/8/29 14:17:16
+     * @Author WN
+     * @Param [eBase]
+     * @Return com.xhkjedu.vo.ResultVo
+     **/
+    @PostMapping("/list_school")
+    public ResultVo listExamSchool(@RequestBody EBase eBase) {
+        N_Utils.validation(new Object[]{eBase.getExamid(), "考试id", 1});
+        List<Map> list = eBaseService.listSchoolsByExamid(eBase.getExamid());
+        return new ResultVo(0, "获取考试关联学校成功",list);
+    }
+
     /*
      * 处理班级试题作答详情和满分
      * @Param []

sexam/src/main/java/com/xhkjedu/sexam/controller/paper/EPaperCorrectclassController.java

@@ -87,19 +87,18 @@ public class EPaperCorrectclassController {
         return new ResultVo(0, "设置成功");
     }
 
-    /**
-     * 查看批阅人
-     *
-     * @return com.xhkjedu.vo.ResultVo
+    /*
+     * @Description 批阅人--学校班级批阅人(兼容集团校)
+     * @Date 2023/8/29 15:32:44
+     * @Author WN
      * @Param [vo]
-     * @Author ywx
-     * @Date 2022/7/20 11:02
+     * @Return com.xhkjedu.vo.ResultVo
      **/
     @PostMapping("/detail")
-    public ResultVo detail(@RequestBody EPClassVo vo) {
+    public ResultVo listSchoolClassCorrect(@RequestBody EPClassVo vo) {
         Integer epid = vo.getEpid();
         N_Utils.validation(new Object[]{epid, "试卷id", 1});
-        List<Map> list = ePaperCorrectclassService.listByEpId(epid);
+        List<Map> list = ePaperCorrectclassService.listClassCorrectByEpId(epid);
         return new ResultVo(0, "获取成功", list);
     }
 

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

@@ -75,4 +75,7 @@ public interface EBaseMapper extends TkMapper<EBase> {
 
     //获取学校当前年份
     Integer getYearBySchoolid(@Param("schoolid") Integer schoolid);
+
+    //获取考试学校id
+    Integer getSchoolidByExamid(@Param("examid") Integer examid);
 }

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

@@ -47,4 +47,10 @@ public interface EClassMapper extends TkMapper<EClass> {
 
     //批量更新班级pdf报告地址
     void updateBatchReportpath(@Param("list")List<EClass> list);
+
+    //获取考试关联的学校信息
+    List<Map> listSchoolsByExamid(@Param("schoolid") Integer schoolid, @Param("examid") Integer examid);
+
+    //获取考试关联的学校班级信息
+    List<Map> listSchoolClassByExamid(@Param("schoolid") Integer schoolid, @Param("examid") Integer examid);
 }

sexam/src/main/java/com/xhkjedu/sexam/mapper/paper/EPaperMapper.java

@@ -71,4 +71,7 @@ public interface EPaperMapper extends TkMapper<EPaper> {
 
     //根据试卷id获取考试状态
     Integer getExamStateByEpId(@Param("epid") Integer epid);
+
+    //获取试卷关联考试及发起学校id
+    Map getExamSchoolidByEpId(@Param("epid") Integer epid);
 }

sexam/src/main/java/com/xhkjedu/sexam/mapper/paperstudent/EPaperStudentMapper.java

@@ -104,7 +104,7 @@ public interface EPaperStudentMapper extends TkMapper<EPaperStudent> {
     Map getExamStateSubjectStateByEpsid(@Param("epsid") Integer epsid);
 
     //缺考详情
-    List<Map> listQkDetail(@Param("epid") Integer epid);
+    List<Map> listQkDetail(@Param("epid") Integer epid,@Param("schoolid") Integer schoolid);
 
     //当天进行中考试列表
     List<Map> listExam(@Param("strtime") String strtime);

sexam/src/main/java/com/xhkjedu/sexam/model/exam/EClass.java

@@ -30,4 +30,7 @@ public class EClass extends BaseBean {
 
     //班级学生报告地址
     private String reportstu;
+
+    //学校id
+    private Integer schoolid;
 }

sexam/src/main/java/com/xhkjedu/sexam/model/exam/EClassStudent.java

@@ -32,4 +32,7 @@ public class EClassStudent extends BaseBean {
 
     @Transient
     private String examno;//考号
+
+    @Transient
+    private Integer schoolid;//学校id
 }

sexam/src/main/java/com/xhkjedu/sexam/service/exam/EBaseService.java

@@ -97,6 +97,7 @@ public class EBaseService {
         if(model.getExammode() == 2) {//线下考试必须有考号
             Integer num = eClassStudentMapper.getNoExamNoNumByClassIds(classids);//根据班级ids获取没有考号学生数量
             if (num != 0) return new ResultVo(1, "有学生未设置考号，请先设置");
+            //验证选择学校的准考证号是否一致
         }
         List<EClassStudent> students = eClassStudentMapper.listByClassIds(classids);
         int stuNum = students.stream().distinct().collect(Collectors.toList()).size();
@@ -355,8 +356,9 @@ public class EBaseService {
     //获取考试和班级信息
     public Map getExamAndClass(Integer examid) {
         Map map = eBaseMapper.findById2(examid);
-        List<Map> classes = eClassMapper.listByExamId(examid);
-        map.put("classes", classes);
+        Integer schoolid = Integer.parseInt(map.get("schoolid").toString());
+        List<Map> schools = eClassMapper.listSchoolClassByExamid(schoolid,examid);
+        map.put("schools", schools);
         return map;
     }
 
@@ -509,8 +511,8 @@ public class EBaseService {
     }
 
     //缺考详情
-    public List<Map> listQkDetail(Integer epid) {
-        List<Map> list = ePaperStudentMapper.listQkDetail(epid);
+    public List<Map> listQkDetail(Integer epid,Integer schoolid) {
+        List<Map> list = ePaperStudentMapper.listQkDetail(epid,schoolid);
         for (Map c : list) {
             List<Map> students=new ArrayList<>();
             String userids = c.get("userids").toString();
@@ -541,4 +543,18 @@ public class EBaseService {
     public Integer getReportState(Integer examid) {
         return eBaseMapper.getReportState(examid);
     }
+
+
+    /*
+     * @Description 获取考试关联学校
+     * @Date 2023/8/29 14:17:29
+     * @Author WN
+     * @Param [examid]
+     * @Return java.util.List<java.util.Map>
+     **/
+    public List<Map> listSchoolsByExamid(Integer examid) {
+        //获取考试信息
+        Integer schoolid = eBaseMapper.getSchoolidByExamid(examid);
+        return eClassMapper.listSchoolsByExamid(schoolid,examid);
+    }
 }

sexam/src/main/java/com/xhkjedu/sexam/service/exam/ESubjectInvigilateService.java

@@ -90,17 +90,27 @@ public class ESubjectInvigilateService {
         return map;
     }
 
-    //监考人查看
+    /*
+     * @Description 监考查看
+     * @Date 2023/8/29 15:54:57
+     * @Author WN
+     * @Param [esid 考试科目id]
+     * @Return java.util.Map
+     **/
     public Map listByEsId(Integer esid) {
+        //获取考试科目关联考试id
+        Map examMap = eSubjectMapper.getESubjectByEsId(esid);
+        Integer examId = Integer.parseInt(examMap.get("examid").toString());
+        Integer schoolId = Integer.parseInt(examMap.get("schoolId").toString());
         Map map = new HashMap();
-        Integer examId = eSubjectMapper.getExamIdByEsId(esid);//根据考试科目id获取考试id
-        List<Map> list = eClassMapper.listByExamId(examId);//考试班级
+        List<Map> list = eClassMapper.listSchoolClassByExamid(schoolId,examId);//考试班级
         List<Map> users = eSubjectInvigilateMapper.listByEsId(esid);//考试监考人
-        map.put("classes", list);
+        map.put("schools", list);
         map.put("teachers", users);
         return map;
     }
 
+
     //监考人删除
     public void delByEsId(Integer esid) {
         eSubjectInvigilateMapper.delByEsId(esid);//删除考试科目监考教师

sexam/src/main/java/com/xhkjedu/sexam/service/paper/EPaperCorrectclassService.java

@@ -54,6 +54,24 @@ public class EPaperCorrectclassService {
         return list;
     }
 
+    //查看批阅人--学校班级
+    public List<Map> listClassCorrectByEpId(Integer epid) {
+        Map examinfo = ePaperMapper.getExamSchoolidByEpId(epid);
+        Integer examId = Integer.parseInt(examinfo.get("examid").toString());
+        Integer schoolId = Integer.parseInt(examinfo.get("schoolid").toString());
+
+        List<Map> list = eClassMapper.listSchoolClassByExamid(schoolId,examId);//考试班级
+        List<Map> users = ePaperCorrectclassMapper.listByEpId(epid);//试卷批阅人
+        for (Map map : list) {
+            List<Map> classes = (List<Map>) map.get("classes");
+            for(Map classMap : classes){
+                List<Map> teachers = users.stream().filter(u -> u.get("classid").equals(map.get("classid"))).collect(Collectors.toList());
+                classMap.put("teachers", teachers);
+            }
+        }
+        return list;
+    }
+
     //根据试卷id获取考试科目基本信息
     public Map getESubjectByEpId(Integer epid) {
         return ePaperMapper.getESubjectByEpId(epid);

sexam/src/main/java/com/xhkjedu/sexam/vo/paper/EPaperVo.java

@@ -24,4 +24,6 @@ public class EPaperVo {
     private List<Map> teachers;//阅卷教师
     private Integer correcttype;//批阅类型
     private String correctJson;//阅卷json
+
+    private Integer schoolid;//学校id
 }

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

@@ -67,7 +67,7 @@
     </select>
     <!--考试基本信息(带考试人数)-->
     <select id="findById2" resultType="java.util.Map">
-        select b.examid,b.examname,b.examdate,b.examtype,b.gradeid,b.exammode,b.monitored,b.examstate,b.examcomm
+        select b.examid,b.examname,b.examdate,b.examtype,b.gradeid,b.exammode,b.monitored,b.examstate,b.examcomm,b.schoolid
         ,teashowrank,stushowrank
         ,(select sum(c.classnum) from e_class c where c.examid=b.examid)examnum
         from e_base b where b.examid=#{examid}
@@ -150,4 +150,9 @@
     <select id="getYearBySchoolid" resultType="java.lang.Integer">
         select `year` from t_school where schoolid=#{schoolid}
     </select>
+
+    <!--获得发起考试学校id-->
+    <select id="getSchoolidByExamid" resultType="java.lang.Integer">
+        select schoolid from e_base where examid=#{examid}
+    </select>
 </mapper>

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

@@ -3,7 +3,7 @@
 <mapper namespace="com.xhkjedu.sexam.mapper.exam.EClassMapper">
     <!--获取班级基本信息列表-->
     <select id="listByClassIds" resultType="com.xhkjedu.sexam.model.exam.EClass">
-        select classid,classname,classnum from t_class
+        select classid,classname,classnum,schoolid from t_class
         where classid in
         <foreach collection="classids" item="classid" index="index" open="(" separator="," close=")">
             ${classid}
@@ -139,4 +139,28 @@
             classid=#{item.classid} and examid=#{item.examid}
         </foreach>
     </update>
+
+    <!--获取考试管理的学校信息-->
+    <select id="listSchoolsByExamid" resultType="java.util.Map">
+        select c.schoolid,s.schoolname from e_class c
+        left join t_school s on c.schoolid=s.schoolid
+        where c.examid=#{examid} group by s.schoolid order by #{schoolid},c.schoolid
+    </select>
+
+    <resultMap id="schoolClass" type="java.util.Map">
+        <result property="schoolid" column="schoolid" />
+        <result property="schoolname" column="schoolname" />
+        <collection property="classes" ofType="java.util.Map" javaType="java.util.List" >
+            <result property="classid" column="classid" />
+            <result property="classname" column="classname" />
+            <result property="classnum" column="classnum" />
+        </collection>
+    </resultMap>
+    <!--考试关联学校班级-->
+    <select id="listSchoolClassByExamid" resultMap="schoolClass">
+        select c.schoolid,s.schoolname,ts.classid,ts.classname,c.classnum from e_class c
+        left join t_school s on c.schoolid=s.schoolid
+        left join t_class ts on c.classid=ts.classid
+        where c.examid=#{examid} order by #{schoolid},c.schoolid,ts.classorder
+    </select>
 </mapper>

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

@@ -13,7 +13,8 @@
     <select id="listByExamId" resultType="java.util.Map">
         select es.ecsid,es.classid,u.username,u.studentno,u.usersex
         from e_class_student es left join t_user u on es.studentid = u.userid
-        where es.examid=#{cs.examid}
+        left join e_class ec on es.classid=ec.classid and es.examid=ec.examid
+        where es.examid=#{cs.examid} and ec.schoolid=#{cs.schoolid}
         <if test="cs.classid!=null and cs.classid!=0">
             and es.classid=#{cs.classid}
         </if>

sexam/src/main/resources/mapper/paper/EPaperMapper.xml

@@ -143,4 +143,10 @@
     <select id="getExamStateByEpId" resultType="java.lang.Integer">
         select eb.examstate from e_paper ep left join e_base eb on ep.examid = eb.examid where ep.epid=#{epid}
     </select>
+
+    <!--获取试卷关联考试及发起学校id-->
+    <select id="getExamSchoolidByEpId" resultType="java.util.Map">
+        select p.examid,e.schoolid from e_paper p
+        left join e_base e on p.examid=e.examid where p.epid=#{epid} limit 1
+    </select>
 </mapper>

sexam/src/main/resources/mapper/paperstudent/EPaperStudentMapper.xml

@@ -362,7 +362,7 @@
         ,truncate(count(distinct case when eps.sstate=3 then eps.epsid else null end)*100/count(*),2)qkrate
         from e_paper_student eps left join e_class ec on eps.examid=ec.examid and eps.classid=ec.classid
         left join t_class c on ec.classid=c.classid
-        where eps.epid=#{epid} group by eps.classid order by c.classtype,c.classorder,ec.ecid
+        where eps.epid=#{epid} and ec.schoolid=#{schoolid} group by eps.classid order by c.classtype,c.classorder,ec.ecid
     </select>
     <!--当天进行中考试列表-->
     <select id="listExam" resultType="java.util.Map">

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

@@ -85,4 +85,19 @@ public class ClassController {
         List<Map> list = classService.listTeacherSubject(classid);
         return new ResultVo(0, "获取任教老师科目列表成功", list);
     }
+
+    /*
+     * @Description 伙伴学校班级
+     * @Date 2023/8/29 10:55:01
+     * @Author WN
+     * @Param [tClass]
+     * @Return com.xhkjedu.vo.ResultVo
+     **/
+    @PostMapping("/list_classjtc")
+    public ResultVo listSchoolAndClass(@RequestBody TClass tClass) {
+        Integer schoolid = tClass.getSchoolid();
+        N_Utils.validation(new Object[]{schoolid, "学校id", 1});
+        List<Map> list = classService.listSchoolAndClass(schoolid);
+        return new ResultVo(0, "获取伙伴学校班级成功", list);
+    }
 }

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

@@ -41,4 +41,7 @@ public interface ClassMapper extends TkMapper<TClass> {
 
     //获取班级信息
     List<ClassVo> listByIds(@Param("classids") List<Integer> classids);
+
+    //获取伙伴学校及伙伴学校班级
+    List<Map> listSchoolAndClass(@Param("schoolid")Integer schoolid);
 }

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

@@ -79,4 +79,15 @@ public class ClassService {
     public List<Map> listTeacherSubject(Integer classid){
         return classMapper.listTeacherSubject(classid);
     }
+
+    /*
+     * @Description 获取伙伴学校及伙伴学校班级
+     * @Date 2023/8/29 10:49:57
+     * @Author WN
+     * @Param [schoolid]
+     * @Return java.util.List<java.util.Map>
+     **/
+    public List<Map> listSchoolAndClass(Integer schoolid) {
+        return classMapper.listSchoolAndClass(schoolid);
+    }
 }

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

@@ -97,4 +97,28 @@
         </foreach>
         group by c.classid
     </select>
+
+    <resultMap id="schoolClass" type="java.util.Map">
+        <result property="schoolid" column="schoolid"/>
+        <result property="schoolname" column="schoolname"/>
+        <collection property="classes" ofType="java.util.Map" javaType="java.util.List">
+            <result property="schoolid" column="schoolid"/>
+            <result property="classid" column="classid"/>
+            <result property="classname" column="classname"/>
+            <result property="gradeid" column="gradeid"/>
+            <result property="classtype" column="classtype"/>
+        </collection>
+    </resultMap>
+    <!--获取伙伴学校及伙伴学校班级-->
+    <select id="listSchoolAndClass" resultMap="schoolClass">
+        select s.schoolid,s.schoolname
+        ,c.classid,c.classname,c.classnum,c.gradeid,c.classtype
+        from t_school_friend sf left join t_school s on sf.fschoolid = s.schoolid
+        left join t_class c on s.schoolid=c.schoolid
+        where sf.schoolid=#{schoolid}
+        and c.year=s.year and c.classstate=1 and c.schoolid=s.schoolid
+        and c.classtype in(1,2) and c.classnum>0
+        group by c.classid
+        order by c.schoolid,c.gradeid,c.classtype,c.classorder,c.classid
+    </select>
 </mapper>