试卷处理

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

@@ -182,7 +182,7 @@ public class EBaseController {
         if (exam.getExamstate() != 0) return new ResultVo(0, "发布成功");
 
         List<UserVo> students = eBaseService.listStuByExamId(examid);//获取考生
-        eBaseService.updateExamStateStart(examid, examcomm, students);//发布考试
+        eBaseService.updateExamStateStart(examid, examcomm, students,exam.getExammode());//发布考试
 
         if (notice == 2 && msg == 2) return new ResultVo(0, "发布成功");
 

sexam/src/main/java/com/xhkjedu/sexam/controller/paperstudent/EPaperStudentController.java

@@ -128,7 +128,6 @@ public class EPaperStudentController {
     @PostMapping("/sca")
     public ResultVo saveCommitPaperScantron(@RequestBody PaperStudentWebVo ps) {
         try {
-            N_Utils.validation(new Object[]{ps.getEpid(), "试卷id", 1,ps.getExamno(),"考号",2});
             ePaperStudentService.saveCommitPaperForScantron(ps);
             return new ResultVo(0, "成功保存学生答题卡");
         } catch (Exception e) {

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

@@ -6,6 +6,7 @@ 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.EPaperMapper;
+import com.xhkjedu.sexam.mapper.paper.EPaperQtypeMapper;
 import com.xhkjedu.sexam.mapper.paperstudent.EPaperStudentMapper;
 import com.xhkjedu.sexam.mapper.system.UserMapper;
 import com.xhkjedu.sexam.model.exam.EBase;
@@ -14,7 +15,9 @@ import com.xhkjedu.sexam.model.exam.EClass;
 import com.xhkjedu.sexam.model.exam.EClassStudent;
 import com.xhkjedu.sexam.model.exam.ESubject;
 import com.xhkjedu.sexam.model.paper.EPaper;
+import com.xhkjedu.sexam.model.paper.EPaperQtypeQuestion;
 import com.xhkjedu.sexam.model.paperstudent.EPaperStudent;
+import com.xhkjedu.sexam.model.paperstudent.EPaperStudentQuestion;
 import com.xhkjedu.sexam.vo.exam.EBaseVo;
 import com.xhkjedu.sexam.vo.system.UserVo;
 import com.xhkjedu.utils.N_Utils;
@@ -49,6 +52,8 @@ public class EBaseService {
     private EPaperStudentMapper ePaperStudentMapper;
     @Resource
     private EBaseMacMapper eBaseMacMapper;
+    @Resource
+    private EPaperQtypeMapper ePaperQtypeMapper;
 
     /**
      * 发起考试
@@ -173,7 +178,7 @@ public class EBaseService {
 
     //发布考试
     @Transactional(rollbackFor = Exception.class)
-    public void updateExamStateStart(Integer examid, String examcomm, List<UserVo> students) {
+    public void updateExamStateStart(Integer examid, String examcomm, List<UserVo> students,Integer exammode) {
         //更改考试状态
         eBaseMapper.postExam(examid, examcomm);
         //发布考试，获取考试试卷题量和分值
@@ -206,6 +211,29 @@ public class EBaseService {
             }
         }
         ePaperStudentMapper.insertList(studentList);//保存考试学生信息
+
+        if(exammode == 2){
+            //代表线下考试，生成学生和试题的关联关系
+            List<EPaperStudentQuestion> stuqlist = new ArrayList<>();
+            for (EPaper paper : papers) {
+                Integer epid = paper.getEpid();
+                //获取试卷中所有试题
+                List<EPaperQtypeQuestion> queslist = ePaperQtypeMapper.listQuestionsByEpid(epid);
+                for (EPaperStudent ps : studentList) {
+                    for(EPaperQtypeQuestion q : queslist){
+                        EPaperStudentQuestion epsq = new EPaperStudentQuestion();
+                        epsq.setClassid(ps.getClassid());
+                        epsq.setStudentid(ps.getStudentid());
+                        epsq.setEpid(ps.getEpid());
+                        epsq.setEpsid(ps.getId());
+                        epsq.setEptqid(q.getEptqid());
+
+                    }
+                }
+            }
+
+
+        }
     }
 
     //结束考试

sexam/src/main/java/com/xhkjedu/sexam/service/paperstudent/EPaperStudentService.java

@@ -423,21 +423,28 @@ public class EPaperStudentService {
      **/
     @Transactional(rollbackFor = Exception.class)
     public void saveCommitPaperForScantron(PaperStudentWebVo pswvo) throws Exception{
+        if(N_Utils.isEmptyInteger(pswvo.getEpid()) || N_Utils.isEmpty(pswvo.getExamno())){
+            updateScanErrorInfo(4,pswvo);
+            return;
+        }
+
         //更加学生姓名和准考证号找到对应学生
         Integer userid = userMapper.getUseridByExamno(pswvo.getExamno());
         if(!N_Utils.isTrueInteger(userid)){
             updateScanErrorInfo(2,pswvo);
+            return;
 //            throw new Exception("考号有误");
         }
         //获取学生试卷
         EPaperStudent ps = ePaperStudentMapper.getPaperStudentByStuidAndEpid(pswvo.getEpid(),userid);
-        pswvo.setEpsid(ps.getEpsid());
 
         //试卷不存在
         if(ps == null) {
             updateScanErrorInfo(3,pswvo);
+            return;
 //            throw new Exception("学生试卷不存在");
         }
+        pswvo.setEpsid(ps.getEpsid());
 
         if(pswvo.getSstate() == 3){
             //说明学生缺考更新状态
@@ -553,6 +560,7 @@ public class EPaperStudentService {
         List<Map> qtypeques = null;
         if(ptype == 1){
             qtypeques = ePaperStudentQuestionMapper.listQStuQuestionScore(epsid);
+            setQuestionsForPaper(qtypeques);
         }else{
             qtypeques = ePaperStudentQuestionMapper.listFjStuQuestionScore(epsid);
         }
@@ -573,14 +581,26 @@ public class EPaperStudentService {
                     Map sque = sonqlst.get(0);
                     Map mque = new HashMap();
                     mque.put("questionid",sque.get("mquestionid").toString());
+                    mque.put("qlevel",2);
                     mque.put("qstem",sque.get("mqstem").toString());
                     mque.put("ctype",Integer.parseInt(sque.get("mctype").toString()));
                     mque.put("qtypeid",sque.get("mqtypeid").toString());
                     mque.put("qtypename",sque.get("mqtypename").toString());
+                    mque.put("qorder",sque.get("qorder").toString());
                     mque.put("qn",sque.get("qn").toString());
-
+                    mque.put("snum",Integer.parseInt(sque.get("snum").toString()));
+                    if(ctype == 12 && sque.get("mhearfile")!=null){
+                        mque.put("hearfile",sque.get("mhearfile").toString());
+                    }else{
+                        mque.put("hearfile","");
+                    }
+                    mque.put("score",sontotalsocre);
+                    mque.put("sonques",sonqlst);
+                    mqlist.add(mque);
                 }
 
+                mt.put("questions",mqlist);
+
             }
         }
     }

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

@@ -39,4 +39,6 @@ public class EBaseVo {
 
     //考试开始时间
     private Integer begintime;
+
+    private Integer exammode;
 }

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

@@ -61,7 +61,7 @@
     </select>
     <!--根据考试id获取考试状态-->
     <select id="getExamStateById" resultType="com.xhkjedu.sexam.vo.exam.EBaseVo">
-        select eb.examid,eb.examname,eb.gradeid,eb.examstate,eb.schoolid
+        select eb.examid,eb.examname,eb.gradeid,eb.examstate,eb.schoolid,eb.exammode
         ,count(case when es.esstate!=1 then es.esid else null end)wwcnum,min(ep.answered)answered
         ,min(ifnull(UNIX_TIMESTAMP(concat(es.sdate,' ',es.begintime)),0))begintime
         from e_base eb left join e_subject es on eb.examid = es.examid

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

@@ -172,7 +172,6 @@
             <result column="qtypename" property="qtypename"></result>
             <result column="qctype" property="ctype"></result>
             <result column="qstem" property="qstem"></result>
-            <result column="hearfile" property="hearfile"></result>
             <result column="qoption" property="qoption"></result>
             <result column="qlevel" property="qlevel"></result>
             <result column="sorder" property="sorder"></result>
@@ -189,7 +188,7 @@
     <select id="listQStuQuestionScore" resultMap="qtypesQuestion">
         select pt.ctype,pt.eptname,pt.eptnum,pt.eptorder,pt.eptscore,
                psq.epsqid,psq.questionid,psq.qorder,psq.qn,ptq.score,ptq.answer,psq.answered,psq.answertype,psq.stuanswer,
-               psq.stuanswertxt,psq.eptqid,psq.stuscore,q.qstem,q.qoption,q.ctype qctype,q.hearfile,q.qtypeid,
+               psq.stuanswertxt,psq.eptqid,psq.stuscore,q.qstem,q.qoption,q.ctype qctype,q.qtypeid,
                q.qtypename,q.qlevel,q.snum,q.sorder,q.questionpid,mq.questionid mquestionid,mq.qstem mqstem,
                mq.qoption mqoption,mq.ctype mctype,mq.qtypeid mqtypeid,mq.qtypename mqtypename,mq.hearfile mhearfile
         from e_paper_student_question psq left join e_paper_qtype_question ptq on psq.eptqid=ptq.eptqid