Merge remote-tracking branch 'origin/ywx' into wn_j

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

@@ -388,4 +388,19 @@ public class EBaseController {
         Map map = eBaseService.getSetState(examid);
         return new ResultVo(0, "获取考试设置状态成功", map);
     }
+
+    /**
+     * 获取mac编号
+     *
+     * @return com.xhkjedu.vo.ResultVo
+     * @Param [mac]
+     * @Author ywx
+     * @Date 2022/8/10 17:40
+     **/
+    @PostMapping("/get_mn")
+    public ResultVo getMacNumber(@RequestBody String mac) {
+        N_Utils.validation(new Object[]{mac, "硬件地址", 2});
+        String macNumber = eBaseService.getMacNumber(mac);
+        return new ResultVo(0, "获取mac编号成功", macNumber);
+    }
 }

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

@@ -99,8 +99,9 @@ public class EPaperCorrectTeacherController {
     public ResultVo getPreQuestion(@RequestBody EPTeacherVo vo) {
         Integer eptqid = vo.getEptqid();
         Integer teacherid = vo.getTeacherid();
-        N_Utils.validation(new Object[]{eptqid, "试卷试题id", 1, teacherid, "教师id", 1});
-        return correctTeacherService.getPreQuestion(eptqid, teacherid);
+        Integer esid = vo.getEsid();
+        N_Utils.validation(new Object[]{eptqid, "试卷试题id", 1, teacherid, "教师id", 1, esid, "考试科目id", 1});
+        return correctTeacherService.getPreQuestion(eptqid, teacherid, esid);
     }
 
     /**

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

@@ -0,0 +1,10 @@
+package com.xhkjedu.sexam.mapper.exam;
+
+import com.xhkjedu.sexam.base.TkMapper;
+import com.xhkjedu.sexam.model.exam.EBaseMac;
+import org.apache.ibatis.annotations.Param;
+
+public interface EBaseMacMapper extends TkMapper<EBaseMac> {
+    //根据mac获取主键
+    Integer getIdByMac(@Param("mac") String mac);
+}

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

@@ -25,7 +25,7 @@ public interface EPaperCorrectTeacherMapper {
     void updateCheckQuestionById(@Param("epsqid") Integer epsqid, @Param("teacherid") Integer teacherid);
 
     //获取上一份批阅试题
-    Map getPreQuestion(@Param("eptqid") Integer eptqid, @Param("teacherid") Integer teacherid);
+    EPaperSQuestionVo getPreQuestion(@Param("eptqid") Integer eptqid, @Param("teacherid") Integer teacherid);
 
     //阅卷记录
     List<Map> listRecord(@Param("eptqid") Integer eptqid, @Param("teacherid") Integer teacherid);

sexam/src/main/java/com/xhkjedu/sexam/mapper/report/ERrankMapper.java

@@ -2,6 +2,9 @@ package com.xhkjedu.sexam.mapper.report;
 
 import com.xhkjedu.sexam.base.TkMapper;
 import com.xhkjedu.sexam.model.report.ERrank;
+import org.apache.ibatis.annotations.Param;
 
 public interface ERrankMapper extends TkMapper<ERrank> {
+    //获取考试报告等级
+    ERrank getByRank(@Param("rank") ERrank rank);
 }

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

@@ -0,0 +1,18 @@
+package com.xhkjedu.sexam.model.exam;
+
+import com.xhkjedu.sexam.model.BaseBean;
+import lombok.Data;
+
+import javax.persistence.Id;
+import javax.persistence.Table;
+
+@Table(name = "e_base_mac")
+@Data
+public class EBaseMac extends BaseBean {
+    @Id
+    //考试扫描设备表
+    private Integer ebmid;
+
+    //硬件地址
+    private String mac;
+}

sexam/src/main/java/com/xhkjedu/sexam/model/report/ERrank.java

@@ -28,7 +28,10 @@ public class ERrank extends BaseBean {
     //分值下线
     private Double minscore;
 
-    //浮动值
+    //临界名次和分值
+    private Integer linescore;
+
+    //浮动名次和分值
     private Integer floatscore;
 
     //创建人id

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

@@ -1,5 +1,6 @@
 package com.xhkjedu.sexam.service.exam;
 
+import com.xhkjedu.sexam.mapper.exam.EBaseMacMapper;
 import com.xhkjedu.sexam.mapper.exam.EBaseMapper;
 import com.xhkjedu.sexam.mapper.exam.EClassMapper;
 import com.xhkjedu.sexam.mapper.exam.EClassStudentMapper;
@@ -8,6 +9,7 @@ import com.xhkjedu.sexam.mapper.paper.EPaperMapper;
 import com.xhkjedu.sexam.mapper.paperstudent.EPaperStudentMapper;
 import com.xhkjedu.sexam.mapper.system.UserMapper;
 import com.xhkjedu.sexam.model.exam.EBase;
+import com.xhkjedu.sexam.model.exam.EBaseMac;
 import com.xhkjedu.sexam.model.exam.EClass;
 import com.xhkjedu.sexam.model.exam.EClassStudent;
 import com.xhkjedu.sexam.model.exam.ESubject;
@@ -45,6 +47,8 @@ public class EBaseService {
     private UserMapper userMapper;
     @Resource
     private EPaperStudentMapper ePaperStudentMapper;
+    @Resource
+    private EBaseMacMapper eBaseMacMapper;
 
     /**
      * 发起考试
@@ -295,4 +299,17 @@ public class EBaseService {
         b.setExamcomm(examcomm);
         eBaseMapper.updateByPrimaryKeySelective(b);
     }
+
+    //获取mac编号
+    public String getMacNumber(String mac) {
+        String macCode = "PC-";
+        Integer ebmid = eBaseMacMapper.getIdByMac(mac);//根据mac获取主键
+        if (ebmid == null) {
+            EBaseMac bm = new EBaseMac();
+            bm.setMac(mac);
+            eBaseMacMapper.insertUseGeneratedKeys(bm);
+            ebmid = bm.getId();
+        }
+        return macCode + ebmid;
+    }
 }

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

@@ -65,10 +65,20 @@ public class EPaperCorrectTeacherService {
     }
 
     //获取上一份批阅试题
-    public ResultVo getPreQuestion(Integer epid, Integer teacherid) {
-        Map q = correctTeacherMapper.getPreQuestion(epid, teacherid);
-        if (q == null) return new ResultVo(1, "您还没有批阅记录");
-        return new ResultVo(0, "获取成功", q);
+    public ResultVo getPreQuestion(Integer eptqid, Integer teacherid, Integer esid) {
+        EPaperSQuestionVo sq = correctTeacherMapper.getPreQuestion(eptqid, teacherid);
+        if (sq == null) return new ResultVo(1, "您还没有批阅记录");
+        Map map = correctTeacherMapper.getExamNameByEsId(esid);//根据考试科目id获取考试名称
+        //试题批阅情况
+        EPaperSQuestionVo q = correctTeacherMapper.getCheckQuestion(eptqid, teacherid);
+        Integer tjnum = q.getTjnum();
+        Integer pynum = q.getPynum();
+        map.put("sq", sq);//学生待批试题
+        map.put("tjnum", tjnum);//提交人数
+        map.put("pynum", pynum);//批阅人数
+        map.put("wpynum", q.getWpynum());//我批阅人数
+        map.put("pyrate", N_Utils.getIntegerDivideAndMulitiply(pynum, tjnum));//批阅进度
+        return new ResultVo(0, "获取成功", map);
     }
 
     //阅卷记录

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

@@ -19,4 +19,7 @@ public class EPaperSQuestionVo {
     private Integer tjnum;//提交人数
     private Integer pynum;//批阅人数
     private Integer wpynum;//我批阅人数
+    private Double stuscore;//学生得分
+    private Integer good;//优秀试卷0默认1优秀
+    private Integer bad;//违纪试卷0默认1违纪
 }

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

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.xhkjedu.sexam.mapper.exam.EBaseMacMapper">
+    <!--根据mac获取主键-->
+    <select id="getIdByMac" resultType="java.lang.Integer">
+        select ebmid from e_base_mac where mac=#{mac} limit 1
+    </select>
+</mapper>

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

@@ -49,7 +49,7 @@
     </select>
     <!--随机获取一条待批阅试题-->
     <select id="getCorrectQuestion" resultType="com.xhkjedu.sexam.vo.paper.EPaperSQuestionVo">
-        select psq.epsqid,psq.stuanswer,psq.qn,psq.eptqid,psq.qscore,psq.epsid
+        select psq.epsqid,psq.stuanswer,psq.qn,psq.eptqid,psq.qscore,psq.stuscore,psq.good,psq.bad,psq.epsid
         from e_paper_student_question psq where psq.eptqid=#{eptqid}
         and psq.answered=1 and (psq.checked=0 or (psq.checked=1 and psq.checkid=#{teacherid}))
         <if test="classids!=null and classids!=''">
@@ -68,8 +68,8 @@
         update e_paper_student_question set checked=1,checkid=#{teacherid} where epsqid=#{epsqid}
     </update>
     <!--获取上一份批阅试题-->
-    <select id="getPreQuestion" resultType="java.util.Map">
-        select psq.epsqid,psq.stuanswer,psq.qn,psq.qorder,psq.qscore,psq.stuscore,psq.good,psq.bad,psq.epsid
+    <select id="getPreQuestion" resultType="com.xhkjedu.sexam.vo.paper.EPaperSQuestionVo">
+        select psq.epsqid,psq.stuanswer,psq.qn,psq.eptqid,psq.qscore,psq.stuscore,psq.good,psq.bad,psq.epsid
         from e_paper_student_question psq where psq.eptqid=#{eptqid} and psq.checked=2 and psq.checkid=#{teacherid}
         order by psq.checktime desc limit 1
     </select>

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

@@ -14,6 +14,6 @@
     <!--获取主观题题号-->
     <select id="listQnByEpId" resultType="java.util.Map">
         select q.qn,q.qorder,q.eptqid
-        from e_paper_qtype_question q where q.epid=#{epid} and q.ctype in(3,14,15) order by q.qorder
+        from e_paper_qtype_question q where q.epid=#{epid} and q.ctype in(3,13,14,15) order by q.qorder
     </select>
 </mapper>