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

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

@@ -53,7 +53,7 @@ public class EPaperQtypeController {
      **/
     @PostMapping("/up")
     public ResultVo updatePaperQtype(@RequestBody EPaper paper){
-        N_Utils.validation(new Object[]{paper.getEsid(),"考试科目id",1,paper.getEpid(),"试卷id",1});
+        N_Utils.validation(new Object[]{paper.getEsid(),"考试科目id",1});
         List<EPaperQtype> qtypes = paper.getQtypelist();
         if(qtypes == null || qtypes.size() == 0){
             return new ResultVo(1,"未设置试题");

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

@@ -64,4 +64,5 @@ public class EPaperStudentController {
         return new ResultVo(0,"成功获取学生试卷",psvo);
     }
 
+
 }

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

@@ -47,7 +47,9 @@ public interface EPaperMapper extends TkMapper<EPaper> {
     //根据试卷id获取考试科目基本信息
     Map getESubjectByEpId(@Param("epid") Integer epid);
 
+    //试科目获取试卷信息
     EExamSubjectPaperVo getPaperParamsByEsid(@Param("esid") Integer esid);
+
     //获取考试试卷题量和分值
     List<EPaper> listNumAndScoreByExamId(@Param("examid") Integer examid);
 }

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

@@ -3,13 +3,18 @@ package com.xhkjedu.sexam.mapper.paperstudent;
 import com.xhkjedu.sexam.base.TkMapper;
 import com.xhkjedu.sexam.model.paperstudent.EPaperStudent;
 import com.xhkjedu.sexam.model.paperstudent.EPaperStudentQuestion;
+import com.xhkjedu.sexam.vo.paperstudent.PsqAnswerVo;
+import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
 /**
- * @Description
+ * @Description 学生试卷试题
  * @Author WN
  * Date 2022/7/27 15:07
  **/
 @Repository
 public interface EPaperStudentQuestionMapper extends TkMapper<EPaperStudentQuestion> {
+
+    //根据学生试题id获取试题正确答案
+    PsqAnswerVo getPaperQuestionAnswer(@Param("epsqid")Integer epsqid);
 }

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

@@ -54,11 +54,10 @@ public class EPaperQtypeService {
         EExamSubjectPaperVo espVo = ePaperMapper.getPaperParamsByEsid(paper.getEsid());
         if(espVo.getExamstate() > 0){
             return new ResultVo(1,"不能进行操作");
-        }else{
-            if(espVo.getEpid()!=null){
-                //说明已经有改考试对应的试卷，删除原试卷，重新保存
-                ePaperMapper.deletePaperByEpid(paper.getEpid());
-            }
+        }
+        if(espVo.getEpid()!=null){
+            //说明已经有改考试对应的试卷，删除原试卷，重新保存
+            ePaperMapper.deletePaperByEpid(paper.getEpid());
         }
 
         List<EPaperQtype> qtypelist = paper.getQtypelist();
@@ -373,7 +372,7 @@ public class EPaperQtypeService {
         }
 
         //删除原试卷
-        ePaperMapper.deletePaperByEpid(paper.getEpid());
+        ePaperMapper.deletePaperByEpid(espVo.getEpid());
 
         List<EPaperQtype> qtypelist = paper.getQtypelist();
         List<EPaperQtypeQuestion> queslist = new ArrayList<>();//存放试题
@@ -403,7 +402,7 @@ public class EPaperQtypeService {
             //如果提交试卷，更改科目状态
             eSubjectMapper.updateExamSubjectState(1,espVo.getEsid());
         }
-        return new ResultVo(0,"保存成功");
+        return new ResultVo(0,"保存成功",epid);
     }
 
     /**

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

@@ -1,5 +1,6 @@
 package com.xhkjedu.sexam.service.paperstudent;
 
+import com.alibaba.fastjson.JSON;
 import com.xhkjedu.sexam.mapper.paper.EPaperQtypeMapper;
 import com.xhkjedu.sexam.mapper.paperstudent.EPaperStudentMapper;
 import com.xhkjedu.sexam.mapper.paperstudent.EPaperStudentQuestionMapper;
@@ -7,12 +8,14 @@ import com.xhkjedu.sexam.model.paper.EPaperQtype;
 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.utils.ExamUtil;
 import com.xhkjedu.sexam.vo.paperstudent.EPaperStudentVo;
+import com.xhkjedu.sexam.vo.paperstudent.PsqAnswerVo;
+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.List;
 import java.util.Map;
 
@@ -31,24 +34,26 @@ public class EPaperStudentService {
     private EPaperStudentQuestionMapper ePaperStudentQuestionMapper;
 
     /**
-     * @Description  学生进行中考试列表
+     * @Description 学生进行中考试列表
      * @Param [eps]
      * @Return java.util.List<java.util.Map>
      * @Author wn
      * @Date 2022/7/27 10:35
      **/
-    public List<Map> listExamPapersForStudent(EPaperStudent eps){
+    public List<Map> listExamPapersForStudent(EPaperStudent eps) {
         return ePaperStudentMapper.listExamPapersForStudent(eps.getStudentid());
     }
 
-    /** 学生已结束考试列表
+    /**
+     * 学生已结束考试列表
+     *
      * @Description
      * @Param [eps]
      * @Return java.util.List<java.util.Map>
      * @Author wn
      * @Date 2022/7/27 11:34
      **/
-    public List<Map> listExamsEndForStudent(EPaperStudent eps){
+    public List<Map> listExamsEndForStudent(EPaperStudent eps) {
         return ePaperStudentMapper.listExamsEndForStudent(eps.getStudentid());
     }
 
@@ -59,28 +64,28 @@ public class EPaperStudentService {
      * @Author wn
      * @Date 2022/7/27 11:48
      **/
-    public List<Map> startPaperForAndroid(EPaperStudent eps){
+    public List<Map> startPaperForAndroid(EPaperStudent eps) {
         Integer epsid = eps.getEpsid();
         //获取试卷基本信息
         EPaperStudentVo psvo = ePaperStudentMapper.getExamSubjectByEpsid(epsid);
         Integer ptype = psvo.getPtype();
 
         List<Map> questions = null;
-        if(ptype == 1){
+        if (ptype == 1) {
             //题库试卷试题
             questions = ePaperStudentMapper.listStuPaperQuestionsForAndroid(epsid);
-        }else{
+        } else {
             questions = ePaperStudentMapper.listStuPaperFjQuestionsForAndroid(epsid);
         }
         //判断是否生成学生试卷，未生成则需要生成，如果已生成直接返回
-        if(questions == null || questions.size() == 0){
+        if (questions == null || questions.size() == 0) {
 
             //保存试卷关联信息
             savePaperStudentQuestion(psvo);
             //保存后重新获取返回
-            if(ptype == 1){
+            if (ptype == 1) {
                 questions = ePaperStudentMapper.listStuPaperQuestionsForAndroid(epsid);
-            }else{
+            } else {
                 questions = ePaperStudentMapper.listStuPaperFjQuestionsForAndroid(epsid);
             }
         }
@@ -88,12 +93,12 @@ public class EPaperStudentService {
     }
 
     //保存学生试卷关联信息
-    private void savePaperStudentQuestion(EPaperStudentVo psvo){
+    private void savePaperStudentQuestion(EPaperStudentVo psvo) {
         //生成学生试卷
         List<EPaperQtypeQuestion> pqlist = ePaperQtypeMapper.listQuestionsByEpid(psvo.getEpid());
 
         List<EPaperStudentQuestion> psqlist = new ArrayList<>();
-        for(EPaperQtypeQuestion q : pqlist){
+        for (EPaperQtypeQuestion q : pqlist) {
             EPaperStudentQuestion sq = new EPaperStudentQuestion();
             sq.setClassid(psvo.getClassid());
             sq.setStudentid(psvo.getStudentid());
@@ -120,27 +125,27 @@ public class EPaperStudentService {
      * @Author wn
      * @Date 2022/7/27 15:36
      **/
-    public EPaperStudentVo startPaperForWeb(EPaperStudent eps){
+    public EPaperStudentVo startPaperForWeb(EPaperStudent eps) {
         Integer epsid = eps.getEpsid();
         //获取试卷基本信息
         EPaperStudentVo psvo = ePaperStudentMapper.getExamSubjectByEpsid(epsid);
         Integer ptype = psvo.getPtype();
 
         List<EPaperQtype> questions = null;
-        if(ptype == 1){
+        if (ptype == 1) {
             //题库试卷试题
             questions = ePaperStudentMapper.listStuPaperQuestionsForWeb(epsid);
-        }else{
+        } else {
             questions = ePaperStudentMapper.listStuPaperFjQuestionsForWeb(epsid);
         }
         //判断是否生成学生试卷，未生成则需要生成，如果已生成直接返回
-        if(questions == null || questions.size() == 0){
+        if (questions == null || questions.size() == 0) {
             //保存试卷关联信息
             savePaperStudentQuestion(psvo);
             //保存后重新获取返回
-            if(ptype == 1){
+            if (ptype == 1) {
                 questions = ePaperStudentMapper.listStuPaperQuestionsForWeb(epsid);
-            }else{
+            } else {
                 questions = ePaperStudentMapper.listStuPaperFjQuestionsForWeb(epsid);
             }
         }
@@ -148,4 +153,75 @@ public class EPaperStudentService {
         return psvo;
     }
 
+    public void saveCommitQuestion(EPaperStudentQuestion psq) {
+        //学生作答提交时先判断试卷是否设置的正确答案
+        PsqAnswerVo answerVo = ePaperStudentQuestionMapper.getPaperQuestionAnswer(psq.getEpsqid());
+        int timestamp = N_Utils.getSecondTimestamp();
+        psq.setAnswertime(timestamp);
+        //试卷已经设置了正确答案
+        if (answerVo.getAnswered() == 1){
+            Double stuscore = 0.0;
+            int coverted = 1;//是否转换0未转换1已转换2转换失败
+            String stuanswer = psq.getStuanswer();
+            List<String> stuanswers = JSON.parseArray(stuanswer, String.class);
+            String qanswer = answerVo.getAnswer();
+            List<String> qanswers = JSON.parseArray(qanswer,String.class);
+            if(N_Utils.isListEmpty(stuanswers) && N_Utils.isEmpty(psq.getStuanswertxt())
+                    && N_Utils.isEmpty(psq.getStuanswertxt())){
+                psq.setStuscore(stuscore);
+                psq.setChecked(1);
+                psq.setChecktime(timestamp);
+                psq.setAnswered(0);
+            }else{
+
+                int ctype = answerVo.getCtype();
+                if(N_Utils.isObjectiveQuestion(ctype)){
+                    //客观题进行批阅
+                    if(ctype == 1){//单选
+                        if(stuanswer.equalsIgnoreCase(qanswer)) {
+                            stuscore = answerVo.getScore();
+                        }
+                    }else if(ctype == 2){//多选
+                        //多选、选错不得分
+                        if(stuanswers.get(0).length() <= qanswer.length()){
+                            String[] qanswerList = qanswers.get(0).split("");
+                            String[] stuanswerList = stuanswers.get(0).split("");
+                            int rightNum = 0;//选对个数
+                            for(String sa : stuanswerList){
+                               int right = 0;
+                               for(String qa : qanswerList){
+                                   if(qa.equals(sa)){
+                                       right = 1;
+                                       rightNum ++;
+                                   }
+                               }
+                               if(right == 0){//说明选错
+                                   rightNum = 0;
+                                   break;
+                               }
+                            }
+                            if(rightNum>0){
+                                if(qanswerList.length == rightNum){
+                                    //全选对
+                                    stuscore = answerVo.getScore();
+                                }else if (qanswerList.length > rightNum){
+                                    //少选得半分
+                                    stuscore = ExamUtil.div(answerVo.getScore(),2,1);
+                                }
+                            }
+                        }
+                    }
+
+                }else{
+
+                }
+                psq.setAnswered(1);
+            }
+
+
+        }
+
+    }
+
+
 }

sexam/src/main/java/com/xhkjedu/sexam/utils/ExamUtil.java

@@ -2,6 +2,7 @@ package com.xhkjedu.sexam.utils;
 
 import lombok.extern.slf4j.Slf4j;
 
+import java.math.BigDecimal;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 
@@ -14,4 +15,34 @@ import java.util.concurrent.ConcurrentHashMap;
 @Slf4j
 public class ExamUtil {
     public static Map<String, String> uriMap = new ConcurrentHashMap<>();
+    // 默认除法运算精度
+    private static final int DEF_DIV_SCALE = 2;
+
+    /**
+     * 提供（相对）精确的除法运算，当发生除不尽的情况时，精确到 小数点以后2位，以后的数字舍弃。
+     *
+     * @param v1 被除数
+     * @param v2 除数
+     * @return 两个参数的商
+     */
+    public static double div(double v1, double v2) {
+        return div(v1, v2, DEF_DIV_SCALE);
+    }
+
+    /**
+     * 提供（相对）精确的除法运算。当发生除不尽的情况时，由scale参数指 定精度，以后的数字舍弃。
+     *
+     * @param v1    被除数
+     * @param v2    除数
+     * @param scale 表示表示需要精确到小数点以后几位。
+     * @return 两个参数的商
+     */
+    public static double div(double v1, double v2, int scale) {
+        if (scale < 0) {
+            throw new IllegalArgumentException("The   scale   must   be   a   positive   integer   or   zero");
+        }
+        BigDecimal b1 = new BigDecimal(Double.toString(v1));
+        BigDecimal b2 = new BigDecimal(Double.toString(v2));
+        return b1.divide(b2, scale, BigDecimal.ROUND_DOWN).doubleValue();
+    }
 }

sexam/src/main/java/com/xhkjedu/sexam/vo/paperstudent/PsqAnswerVo.java

@@ -0,0 +1,21 @@
+package com.xhkjedu.sexam.vo.paperstudent;
+
+import lombok.Data;
+
+/**
+ * @Description 试题答案
+ * @Author WN
+ * Date 2022/7/28 9:42
+ **/
+@Data
+public class PsqAnswerVo {
+    private Integer eptqid;//试卷中试题id
+
+    private Integer ctype;//处理题型
+
+    private Double score;//试题分值
+
+    private String answer;//答案
+
+    private Integer answered;//试卷是否设置正确答案1已设置0未设置
+}

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

@@ -5,10 +5,10 @@
     <!--学生进行中考试列表-->
     <select id="listExamPapersForStudent" resultType="java.util.Map">
         select eps.epsid, es.esid,es.examid,es.subjectid,es.subjectname,es.sdate,es.begintime,es.endtime,
-        e.examname,e.gradeid,e.examtype,ep.epid
+        e.examname,e.gradeid,e.examtype,ep.epid,ep.ptype
         from e_paper_student eps left join e_subject es on eps.esid=es.esid
          left join e_paper ep on eps.epid=ep.epid left join e_base e on eps.examid=e.examid
-        where e.deleted=1 and eps.studentid=#{studentid} and e.examstate=1 GROUP BY eps.epsid
+        where e.deleted=1 and e.monitored=1 and eps.studentid=#{studentid} and e.examstate=1 GROUP BY eps.epsid
         order by abs(UNIX_TIMESTAMP(concat(es.sdate,' ',es.begintime))-UNIX_TIMESTAMP())
     </select>
 

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

@@ -0,0 +1,11 @@
+<?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.paperstudent.EPaperStudentQuestionMapper">
+
+    <!--根据学生试题id获取试题正确答案-->
+    <select id="getPaperQuestionAnswer" resultType="com.xhkjedu.sexam.vo.paperstudent.PsqAnswerVo">
+        select psq.eptqid,ptq.ctype,ptq.score,ptq.answer,p.answered
+        from e_paper_student_question psq left join e_paper_qtype_question ptq on psq.eptqid=ptq.eptqid
+        left join e_paper p on psq.epid=p.epid where psq.epsqid=#{epsqid}
+    </select>
+</mapper>