考试详情改版 阅卷设置 监考设置 考试基础信息参数校验

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

@@ -1,5 +1,6 @@
 package com.xhkjedu.sexam.controller.exam;
 
+import com.alibaba.fastjson.JSON;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.xhkjedu.sexam.model.exam.EBase;
@@ -14,6 +15,7 @@ import com.xhkjedu.sexam.service.notice.NoticeService;
 import com.xhkjedu.sexam.service.report.EReportGenerateService;
 import com.xhkjedu.sexam.vo.exam.EBaseVo;
 import com.xhkjedu.sexam.vo.exam.ExamVo;
+import com.xhkjedu.sexam.vo.paper.EPaperVo;
 import com.xhkjedu.sexam.vo.system.UserVo;
 import com.xhkjedu.utils.N_Utils;
 import com.xhkjedu.utils.PageUtil;
@@ -59,6 +61,9 @@ public class EBaseController {
     public ResultVo add(@RequestBody EBase eBase) {
         if (N_Utils.isListEmpty(eBase.getClassids())) return new ResultVo(1, "考试班级不能为空");
         if (N_Utils.isListEmpty(eBase.getSubjects())) return new ResultVo(1, "考试科目不能为空");
+        if ("NaN-aN-aN".equals(eBase.getExamdate())) {
+            return new ResultVo(1,"日期格式不正确");
+        }
         return eBaseService.save(eBase);
     }
 
@@ -79,8 +84,19 @@ public class EBaseController {
         Integer createid = map.getHandleid();
         Integer examid = map.getExamid();
         N_Utils.validation(new Object[]{schoolid, "学校id", 1, createid, "操作人id", 1, examid, "考试id", 1});
-        Integer examstate = eBaseService.getExamState(examid);
-        if (2 <= examstate) return new ResultVo(1, "考试已结束禁止操作");
+        EBaseVo vo = eBaseService.getExamStateAndMode(examid);
+        if (2 <= vo.getExamstate()) return new ResultVo(1, "考试已结束禁止操作");
+
+        if (JSON.toJSONString(subjects).contains("NaN-aN-aN")) {
+            return new ResultVo(1,"日期格式不正确");
+        }
+        if (vo.getExammode() == 1) {//线上的考试必须有时间
+            for (ESubject es : subjects) {
+                if (N_Utils.isEmpty(es.getSdate()) || N_Utils.isEmpty(es.getBegintime()) || N_Utils.isEmpty(es.getEndtime())) {
+                    return new ResultVo(1, "考试时间不能为空");
+                }
+            }
+        }
         List<TNotice> noticeList = new ArrayList<>();
         List<TMsg> msgList = new ArrayList<>();
         String examname = eBaseService.getNameByExamId(examid);
@@ -190,6 +206,7 @@ public class EBaseController {
         EBaseVo exam = eBaseService.getExamStateById(examid);//根据考试id获取考试状态
         String examname = exam.getExamname();
         Integer schoolid = exam.getSchoolid();
+        if (exam.getExammode() == 1 && exam.getBegintime() == 0) return new ResultVo(1, "还有考试试卷未设置时间");
         if (exam.getWwcnum() != 0) return new ResultVo(1, "还有考试试卷未设置完成");
         if (exam.getAnswered() == 0) return new ResultVo(1, "还有考试试卷未设置正确答案");
         if (exam.getExamstate() != 0) return new ResultVo(0, "发布成功");
@@ -529,4 +546,19 @@ public class EBaseController {
         return new ResultVo(0, "获取考试未批阅试题数量成功", num);
     }
 
+    /*
+     * 缺考详情
+     * @Param [vo]
+     * @Author ywx
+     * @Date 2022/11/9 17:24
+     * @return com.xhkjedu.vo.ResultVo
+     **/
+    @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);
+        return new ResultVo(0, "获取缺考详情成功", list);
+    }
+
 }

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

@@ -57,4 +57,7 @@ public interface EBaseMapper extends TkMapper<EBase> {
 
     //考试未批阅试题数量
     Integer getNoCheckNum(@Param("examid") Integer examid);
+
+    //根据考试id获取状态和模式
+    EBaseVo getExamStateAndMode(@Param("examid") Integer examid);
 }

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

@@ -2,6 +2,7 @@ package com.xhkjedu.sexam.mapper.exam;
 
 import com.xhkjedu.sexam.base.TkMapper;
 import com.xhkjedu.sexam.model.exam.ESubjectInvigilate;
+import com.xhkjedu.sexam.vo.exam.EITeacherVo;
 import com.xhkjedu.sexam.vo.paper.EPTeacherVo;
 import org.apache.ibatis.annotations.Param;
 
@@ -24,4 +25,7 @@ public interface ESubjectInvigilateMapper extends TkMapper<ESubjectInvigilate> {
 
     //缺考学生列表
     List<Map> listMissStu(@Param("vo") EPTeacherVo vo);
+
+    //监考教师
+    List<EITeacherVo> listUserByEsIds(@Param("esids") String esids);
 }

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

@@ -102,4 +102,7 @@ public interface EPaperStudentMapper extends TkMapper<EPaperStudent> {
 
     //根据试卷学生id获取考试状态和考试科目状态和时间
     Map getExamStateSubjectStateByEpsid(@Param("epsid") Integer epsid);
+
+    //缺考详情
+    List<Map> listQkDetail(@Param("epid") Integer epid);
 }

sexam/src/main/java/com/xhkjedu/sexam/mapper/system/UserMapper.java

@@ -30,4 +30,7 @@ public interface UserMapper {
 
     //根据用户id获取用户类型
     Integer getUsertypeByUserid(@Param("userid")Integer userid);
+
+    //根据用户ids查找用户
+    List<Map> listByUserIds(@Param("userids") String userids);
 }

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

@@ -432,4 +432,22 @@ public class EBaseService {
     public Integer getNoCheckNum(Integer examid) {
         return eBaseMapper.getNoCheckNum(examid);
     }
+
+    //根据考试id获取状态和模式
+    public EBaseVo getExamStateAndMode(Integer examid) {
+        return eBaseMapper.getExamStateAndMode(examid);
+    }
+
+    //缺考详情
+    public List<Map> listQkDetail(Integer epid) {
+        List<Map> list = ePaperStudentMapper.listQkDetail(epid);
+        for (Map c : list) {
+            List<Map> students=new ArrayList<>();
+            String userids = c.get("userids").toString();
+            if(N_Utils.isNotEmpty(userids)) students = userMapper.listByUserIds(userids);
+            c.put("students", students);
+            c.remove("userids");
+        }
+        return list;
+    }
 }

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

@@ -1,12 +1,14 @@
 package com.xhkjedu.sexam.service.exam;
 
 import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.serializer.SerializerFeature;
 import com.xhkjedu.config.MissingParametersException;
 import com.xhkjedu.sexam.mapper.exam.EBaseMapper;
 import com.xhkjedu.sexam.mapper.exam.EClassMapper;
 import com.xhkjedu.sexam.mapper.exam.ESubjectInvigilateMapper;
 import com.xhkjedu.sexam.mapper.exam.ESubjectMapper;
 import com.xhkjedu.sexam.model.exam.ESubjectInvigilate;
+import com.xhkjedu.sexam.vo.exam.EITeacherVo;
 import com.xhkjedu.sexam.vo.paper.EPTeacherVo;
 import com.xhkjedu.utils.N_Utils;
 import org.springframework.stereotype.Service;
@@ -17,6 +19,7 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 @Service
 public class ESubjectInvigilateService {
@@ -49,6 +52,36 @@ public class ESubjectInvigilateService {
     public Map listSubject(Integer examid) {
         Map map = eBaseMapper.findById(examid);
         List<Map> subjects = eSubjectInvigilateMapper.listSubject(examid);//监考设置列表
+        String esids = subjects.stream().map(s -> s.get("esid").toString()).collect(Collectors.joining(","));
+        List<EITeacherVo> users = eSubjectInvigilateMapper.listUserByEsIds(esids);
+        List<Map> classes = eClassMapper.listByExamId(examid);//考试班级
+        for (Map s : subjects) {
+            Integer esid = (Integer) s.get("esid");
+            if (N_Utils.isListEmpty(users)) users = new ArrayList<>();
+            String majorname = users.stream().filter(u -> esid.equals(u.getEsid()) && u.getMajored() == 1)
+                    .map(u -> u.getUsername()).distinct().collect(Collectors.joining("、"));
+            s.put("majorname", majorname);
+            long einum = users.stream().filter(u -> !N_Utils.isEmptyInteger(u.getClassid()))
+                    .map(u -> u.getClassid()).distinct().count();
+            s.put("einum", einum);
+            for (Map c : classes) {
+                Integer classid = (Integer) c.get("classid");
+                List<Map> teachers=new ArrayList<>();
+                for (EITeacherVo u : users) {
+                    if(esid.equals(u.getEsid())&& (1 == u.getMajored() || classid.equals(u.getClassid()))){
+                        Map t=new HashMap();
+                        t.put("teacherid",u.getTeacherid());
+                        t.put("username",u.getUsername());
+                        t.put("loginname",u.getLoginname());
+                        teachers.add(t);
+                    }
+                }
+                c.put("teachers", teachers.stream().distinct().collect(Collectors.toList()));
+            }
+            //关闭引用检测，避免循环给classes赋值出现"$ref":"$[0]"现象
+            String str = JSON.toJSONString(classes, SerializerFeature.DisableCircularReferenceDetect);
+            s.put("classes", JSON.parseArray(str, Map.class));
+        }
         map.put("subjects", subjects);
         return map;
     }

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

@@ -4,17 +4,15 @@ import com.xhkjedu.sexam.mapper.exam.EBaseMapper;
 import com.xhkjedu.sexam.mapper.exam.EClassMapper;
 import com.xhkjedu.sexam.mapper.exam.EClassStudentMapper;
 import com.xhkjedu.sexam.mapper.exam.ESubjectMapper;
+import com.xhkjedu.sexam.mapper.paper.EPaperCorrectclassMapper;
+import com.xhkjedu.sexam.mapper.paper.EPaperCorrectquestionMapper;
 import com.xhkjedu.sexam.mapper.system.UserMapper;
 import com.xhkjedu.sexam.vo.exam.CTeacherVo;
 import com.xhkjedu.utils.N_Utils;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.stream.Collectors;
 
 @Service
@@ -29,6 +27,10 @@ public class ESubjectSearchService {
     private UserMapper userMapper;
     @Resource
     private EClassStudentMapper eClassStudentMapper;
+    @Resource
+    private EPaperCorrectclassMapper ePaperCorrectclassMapper;
+    @Resource
+    private EPaperCorrectquestionMapper ePaperCorrectquestionMapper;
 
     //查找设置
     public List<Map> listSearchTeacher(Integer examid, Integer schoolid) {
@@ -110,6 +112,30 @@ public class ESubjectSearchService {
     public Map listSubject(Integer examid) {
         Map map = eBaseMapper.findById(examid);
         List<Map> subjects = eSubjectMapper.listSubjectCSet(examid);//考试科目阅卷设置列表
+        for (Map s : subjects) {
+            Integer correcttype = (Integer) s.get("correcttype");
+            Integer epid = (Integer) s.get("epid");
+            List<Map> list=new ArrayList<>();
+            if (correcttype == 1) {
+                list = eClassMapper.listByExamId(examid);//考试班级
+                List<Map> users = ePaperCorrectclassMapper.listByEpId(epid);//试卷批阅人
+                for (Map m : list) {
+                    List<Map> teachers = users.stream().filter(u -> u.get("classid").equals(m.get("classid")))
+                            .sorted(Comparator.comparing(t->t.get("username").toString())).collect(Collectors.toList());
+                    m.put("teachers", teachers);
+                }
+            } else if (correcttype == 2) {
+                list = ePaperCorrectquestionMapper.listQnByEpId(epid);
+                List<Map> users = ePaperCorrectquestionMapper.listByEpId(epid);//试卷批阅人
+                for (Map q : list) {
+                    Object qorder = q.get("qorder");
+                    List<Map> teachers = users.stream().filter(u -> u.get("qorder").equals(qorder))
+                            .sorted(Comparator.comparing(t->t.get("username").toString())).collect(Collectors.toList());
+                    q.put("teachers", teachers);
+                }
+            }
+            s.put("correctList", list);
+        }
         map.put("subjects", subjects);
         return map;
     }

sexam/src/main/java/com/xhkjedu/sexam/vo/exam/EITeacherVo.java

@@ -0,0 +1,20 @@
+package com.xhkjedu.sexam.vo.exam;
+
+import lombok.Data;
+
+/**
+ * 
+ * @Param 监考教师
+ * @Author ywx
+ * @Date 2022/11/9 16:21
+ * @return 
+ **/
+@Data
+public class EITeacherVo {
+    private Integer esid;//考试科目id
+    private Integer classid;//班级id
+    private Integer majored;//是否是主监考0不是1是
+    private Integer teacherid;//教师id
+    private String username;//姓名
+    private String loginname;//账号
+}

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

@@ -122,4 +122,9 @@
         select count(*) from e_paper_student_question
         where examid=#{examid} and answered=1 and checked!=2
     </select>
+    <!--根据考试id获取状态和模式-->
+    <select id="getExamStateAndMode" resultType="com.xhkjedu.sexam.vo.exam.EBaseVo">
+        select eb.examstate,eb.exammode
+        from e_base eb where eb.examid=#{examid}
+    </select>
 </mapper>

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

@@ -7,13 +7,10 @@
     </delete>
     <!--监考设置列表-->
     <select id="listSubject" resultType="java.util.Map">
-        select s.*,ifnull(ep.pnum,0)pnum,ifnull(ep.pscore,0)pscore,ep.correcttype
-        from (select s.esid,s.subjectid,s.sdate,s.begintime,s.endtime,s.esstate,s.subjectname
-        ,group_concat(u.username separator '、')majorname
-        ,count(DISTINCT ei.classid) einum
-        from e_subject s left join e_subject_invigilate ei on ei.esid=s.esid
-        left join t_user u on u.userid=ei.teacherid and ei.majored=1
-        where s.examid=#{examid} group by s.esid)s left join e_paper ep on s.esid = ep.esid
+        select s.esid,s.subjectid,s.sdate,s.begintime,s.endtime,s.esstate,s.subjectname
+        ,ifnull(ep.pnum,0)pnum,ifnull(ep.pscore,0)pscore,ep.correcttype
+        from e_subject s left join e_paper ep on s.esid = ep.esid
+        where s.examid=#{examid} group by s.esid
     </select>
     <!--考试监考人-->
     <select id="listByEsId" resultType="java.util.Map">
@@ -64,6 +61,12 @@
         select eps.studentid,u.username,eps.sstate
         from e_paper_student eps  left join t_user u on eps.studentid = u.userid
         where eps.esid=#{vo.esid} and eps.sstate in(0,3) and eps.classid in(${vo.classids})
-        order by convert(u.username using gbk)
+        order by convert(u.username using gbk),u.userid
+    </select>
+    <!--考试监考人-->
+    <select id="listUserByEsIds" resultType="com.xhkjedu.sexam.vo.exam.EITeacherVo">
+        select ei.esid,ei.classid,ei.majored,ei.teacherid,u.username,u.loginname
+        from e_subject_invigilate ei left join t_user u on ei.teacherid = u.userid
+        where ei.esid in(${esids}) order by convert(u.username using gbk),u.userid
     </select>
 </mapper>

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

@@ -21,8 +21,11 @@
     </update>
     <!--考试科目列表-->
     <select id="listSubject" resultType="java.util.Map">
-        select es.subjectid,es.subjectname,es.sdate,es.begintime,es.endtime,es.teacherid,u.username
-        from e_subject es left join t_user u on es.teacherid=u.userid
+        select es.subjectid,es.subjectname,es.sdate,es.begintime,es.endtime
+        ,(case when es.esstate!=0 then ep.handleid else es.teacherid end)teacherid
+        ,(select u.username from t_user u where u.userid=
+        (case when es.esstate!=0 then ep.handleid else ifnull(es.teacherid,0) end))username
+        from e_subject es left join e_paper ep on es.esid = ep.esid
         where examid=#{examid} order by es.esid
     </select>
     <!--根据考试科目id获取考试id-->
@@ -30,10 +33,39 @@
         select examid from e_subject where esid=#{esid} limit 1
     </select>
     <!--考试科目设置列表-->
-    <select id="listSubjectSet" resultType="java.util.Map">
+    <resultMap id="subjectResult" type="java.util.Map">
+        <collection property="yjteachers" ofType="java.util.Map" javaType="java.util.List"
+                    select="listYjTeacher" column="epid=epid,correcttype=correcttype">
+        </collection>
+        <collection property="jkteachers" ofType="java.util.Map" javaType="java.util.List"
+                    select="listJkTeacher" column="esid=esid">
+        </collection>
+    </resultMap>
+    <select id="listYjTeacher" resultType="java.util.Map">
+        <if test="correcttype==2">
+            select u.username,u.loginname
+            from t_user u where u.userid in(select distinct epc.teacherid
+            from e_paper_correctquestion epc where epc.epid=#{epid})
+            order by convert(u.username using gbk),u.userid
+        </if>
+        <if test="correcttype!=2">
+            select u.username,u.loginname
+            from t_user u where u.userid in(select distinct epc.teacherid
+            from e_paper_correctclass epc where epc.epid=#{epid})
+            order by convert(u.username using gbk),u.userid
+        </if>
+    </select>
+    <select id="listJkTeacher" resultType="java.util.Map">
+        select u.username,u.loginname
+        from t_user u where u.userid in(select distinct ei.teacherid
+        from e_subject_invigilate ei where ei.esid=#{esid})
+        order by convert(u.username using gbk),u.userid
+    </select>
+    <select id="listSubjectSet" resultMap="subjectResult">
         select es.subjectid,es.subjectname,es.sdate,es.begintime,es.endtime,es.esstate
         ,ep.correcttype,es.esid,ep.epid,ep.ptype
-        ,(select count(distinct ei.teacherid) from e_subject_invigilate ei where ei.esid=es.esid)jkjsnum
+        ,(select u.username from t_user u where u.userid=
+        (case when es.esstate!=0 then ep.handleid else ifnull(es.teacherid,0) end))cjteacher
         ,count(distinct case when eps.sstate=3 then eps.epsid else null end)qknum
         ,count(distinct case when eps.sstate=2 then eps.epsid else null end)tjnum
         ,ifnull(truncate(count(case when psq.answered=1 AND psq.checked=2 then psq.epsqid else null end)*100/

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

@@ -338,4 +338,13 @@
         left join e_base b on b.examid = eps.examid left join e_subject s on eps.esid=s.esid
         where eps.epsid=#{epsid}
     </select>
+    <!--缺考详情-->
+    <select id="listQkDetail" resultType="java.util.Map">
+        select ec.classid,ec.classname,ec.classnum
+        ,count(distinct case when eps.sstate=3 then eps.epsid else null end)qknum
+        ,group_concat(case when eps.sstate=3 then eps.studentid else null end)userids
+        ,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
+        where eps.epid=#{epid} group by eps.classid order by ec.ecid
+    </select>
 </mapper>

sexam/src/main/resources/mapper/system/UserMapper.xml

@@ -58,4 +58,10 @@
     <select id="getUsertypeByUserid" resultType="java.lang.Integer">
         select usertype from t_user where userid=#{userid}
     </select>
+    <!--根据用户ids查找用户-->
+    <select id="listByUserIds" resultType="java.util.Map">
+        select u.username,u.loginname
+        from t_user u where u.userid in(${userids})
+        order by convert(u.username using gbk),u.userid
+    </select>
 </mapper>