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

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

@@ -4,6 +4,7 @@ import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.xhkjedu.sexam.model.paper.EPaperQtype;
 import com.xhkjedu.sexam.model.paperstudent.EPaperStudent;
+import com.xhkjedu.sexam.model.paperstudent.EPaperStudentQuestion;
 import com.xhkjedu.sexam.service.paperstudent.EPaperStudentService;
 import com.xhkjedu.sexam.vo.paperstudent.EPaperStudentVo;
 import com.xhkjedu.utils.N_Utils;
@@ -64,5 +65,19 @@ public class EPaperStudentController {
         return new ResultVo(0,"成功获取学生试卷",psvo);
     }
 
+    //提交单题
+    @PostMapping("/scq")
+    public ResultVo saveCommitQuestion(@RequestBody EPaperStudentQuestion sq){
+       try {
+           N_Utils.validation(new Object[]{sq.getEpsqid(),"试题id",1});
+           ePaperStudentService.saveCommitQuestion(sq);
+           return new ResultVo(0,"成功提交试题");
+       }catch (Exception e){
+           return new ResultVo(1,"提交试题失败");
+       }
+    }
+
+
+
 
 }

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

@@ -17,4 +17,7 @@ public interface EPaperStudentQuestionMapper extends TkMapper<EPaperStudentQuest
 
     //根据学生试题id获取试题正确答案
     PsqAnswerVo getPaperQuestionAnswer(@Param("epsqid")Integer epsqid);
+
+    //提交单题
+    void updateStuAnswer(@Param("q")EPaperStudentQuestion q);
 }

sexam/src/main/java/com/xhkjedu/sexam/model/paperstudent/EPaperStudentQuestion.java

@@ -40,7 +40,7 @@ public class EPaperStudentQuestion extends BaseBean {
     private Integer answered;
 
     //答案类型1选择题、图片2纯文本
-    private Integer ansertype;
+    private Integer answertype;
 
     //学生答案（选项、图片）
     private String stuanswer;

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

@@ -83,7 +83,7 @@ public class EPaperQtypeService {
         }
 
         //更加试卷状态是否需要生成分析和更改科目状态
-        if(espVo.getExammode() == 2 && paper.getPstate()!=null && paper.getPstate() == 1){
+        if(espVo.getExammode() == 1 && paper.getPstate()!=null && paper.getPstate() == 1){
             //如果提交试卷，更改科目状态
             eSubjectMapper.updateExamSubjectState(1,espVo.getEsid());
         }
@@ -112,6 +112,7 @@ public class EPaperQtypeService {
         paper.setCreatetime(timestamp);
         paper.setHandletime(timestamp);
         paper.setHandleid(paper.getCreateid());
+        paper.setCorrecttype(0);
         if(paper.getPtype() == 1){
             paper.setAnswered(1);//题库已设置正确答案
         }else{
@@ -398,7 +399,7 @@ public class EPaperQtypeService {
         }
 
         //更加试卷状态是否需要生成分析和更改科目状态
-        if(paper.getPstate()!=null && paper.getPstate() == 1){
+        if(espVo.getExammode() == 1 && paper.getPstate()!=null && paper.getPstate() == 1){
             //如果提交试卷，更改科目状态
             eSubjectMapper.updateExamSubjectState(1,espVo.getEsid());
         }
@@ -568,26 +569,6 @@ public class EPaperQtypeService {
     @Transactional(rollbackFor = Exception.class)
     public void savePaperScan(EPaper paper){
         List<EPaperQtypeQuestion> questions = paper.getQuestions();
-        for(EPaperQtypeQuestion q : questions){
-            List<String> coorlist = q.getCoordlist();
-            if(q.getCtype() == 3 || q.getCtype() == 14 || q.getCtype() == 15){
-                if(coorlist.size() > 1){
-                    //有多个坐标，合并为一个
-                    List<List> savecoor = new ArrayList<>();
-                    for(String str : coorlist){
-                        List lst = JSON.parseArray(str);
-                        for(int i=0;i<lst.size();i++){
-                            savecoor.add((List)lst.get(i));
-                        }
-                    }
-                    q.setCoord(JSON.toJSONString(savecoor));
-                }else{
-                    q.setCoord(coorlist.get(0));
-                }
-            }else{
-                q.setCoord(coorlist.get(0));
-            }
-        }
         ePaperMapper.updatePaperScantron(paper);
         ePaperQtypeMapper.updateBatchQuestionForScan(questions);
         if(paper.getPstate() == 1){

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

@@ -12,6 +12,7 @@ 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 lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -25,6 +26,7 @@ import java.util.Map;
  * Date 2022/7/26 14:00
  **/
 @Service
+@Slf4j
 public class EPaperStudentService {
     @Resource
     private EPaperStudentMapper ePaperStudentMapper;
@@ -153,75 +155,127 @@ 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;
+    /**
+     * @Description 提交单题
+     * @Param [psq]
+     * @Return void
+     * @Author wn
+     * @Date 2022/7/28 13:47
+     **/
+    public void saveCommitQuestion(EPaperStudentQuestion psq) throws Exception {
+        try {
+            //学生作答提交时先判断试卷是否设置的正确答案
+            PsqAnswerVo answerVo = ePaperStudentQuestionMapper.getPaperQuestionAnswer(psq.getEpsqid());
+            int timestamp = N_Utils.getSecondTimestamp();
+            psq.setAnswertime(timestamp);
             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);
+            Double stuscore = 0.0;
+
             if(N_Utils.isListEmpty(stuanswers) && N_Utils.isEmpty(psq.getStuanswertxt())
                     && N_Utils.isEmpty(psq.getStuanswertxt())){
                 psq.setStuscore(stuscore);
-                psq.setChecked(1);
+                psq.setChecked(2);
                 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){
-                                    //全选对
+                //试卷已经设置了正确答案
+                if (answerVo.getAnswered() == 1){
+                    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 || ctype == 4 || ctype == 5 || ctype == 6){
+                                //单选、判断
+                                if(stuanswer.equalsIgnoreCase(qanswer)) {
                                     stuscore = answerVo.getScore();
-                                }else if (qanswerList.length > rightNum){
-                                    //少选得半分
-                                    stuscore = ExamUtil.div(answerVo.getScore(),2,1);
                                 }
+                            }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 if(ctype == 7 || ctype == 8 || ctype == 10){
+                                //完形填空、阅读理解、任务型阅读
+                                Double qscore = ExamUtil.div(answerVo.getScore(),qanswers.size());
+                                Double stuScoreDouble = 0d;
+                                for(int i=0;i<qanswers.size();i++){
+                                    if(qanswers.get(i).equalsIgnoreCase(stuanswers.get(i))){
+                                        stuScoreDouble = ExamUtil.add(stuScoreDouble,qscore);
+                                    }
+                                }
+                                stuscore = ExamUtil.round(stuScoreDouble,1);
+                            }
+                            if(stuscore.compareTo(answerVo.getScore()) == 1){
+                                stuscore = answerVo.getScore();
+                            }
+                            psq.setStuscore(stuscore);
+                            psq.setChecked(2);
+                            psq.setChecktime(timestamp);
+                        }else{
+
+                            if(stuanswers.size() > 0){
+                                coverted = 0;//上传的多张图片设为0未转换
                             }
                         }
+                        psq.setAnswered(1);
                     }
-
-                }else{
-
                 }
-                psq.setAnswered(1);
             }
 
-
+            Integer costtime = answerVo.getCosttime();
+            if(costtime == null){
+                costtime = 0;
+            }
+            psq.setCosttime(psq.getCosttime() + costtime);
+            psq.setConverted(coverted);
+            ePaperStudentQuestionMapper.updateStuAnswer(psq);
+        }catch (Exception e){
+            log.error("提交试题失败："+e.getMessage());
+            throw new Exception("提交试题失败");
         }
 
     }
 
+    public int saveCommitPaper(Integer epsid){
+        EPaperStudent ps = ePaperStudentMapper.selectByPrimaryKey(epsid);
+        if(ps == null || ps.getSstate() == 1){
+            return 1;
+        }
+        return 1;
+    }
 
 }

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

@@ -45,4 +45,59 @@ public class ExamUtil {
         BigDecimal b2 = new BigDecimal(Double.toString(v2));
         return b1.divide(b2, scale, BigDecimal.ROUND_DOWN).doubleValue();
     }
+
+    /**
+     * 提供精确的加法运算。
+     *
+     * @param v1 被加数
+     * @param v2 加数
+     * @return 两个参数的和
+     */
+    public static double add(double v1, double v2) {
+        BigDecimal b1 = new BigDecimal(Double.toString(v1));
+        BigDecimal b2 = new BigDecimal(Double.toString(v2));
+        return b1.add(b2).doubleValue();
+    }
+
+    /**
+     * 提供精确的小数位四舍五入处理。
+     *
+     * @param v     需要四舍五入的数字
+     * @param scale 小数点后保留几位
+     * @return 四舍五入后的结果
+     */
+    public static double round(double v, int scale) {
+        if (scale < 0) {
+            throw new IllegalArgumentException("The   scale   must   be   a   positive   integer   or   zero");
+        }
+        BigDecimal b = new BigDecimal(Double.toString(v));
+        BigDecimal one = new BigDecimal("1");
+        return b.divide(one, scale, BigDecimal.ROUND_HALF_UP).doubleValue();
+    }
+
+    /**
+     * 提供精确的减法运算。
+     *
+     * @param v1 被减数
+     * @param v2 减数
+     * @return 两个参数的差
+     */
+    public static double sub(double v1, double v2) {
+        BigDecimal b1 = new BigDecimal(Double.toString(v1));
+        BigDecimal b2 = new BigDecimal(Double.toString(v2));
+        return b1.subtract(b2).doubleValue();
+    }
+
+    /**
+     * 提供精确的乘法运算。
+     *
+     * @param v1 被乘数
+     * @param v2 乘数
+     * @return 两个参数的积
+     */
+    public static double mul(double v1, double v2) {
+        BigDecimal b1 = new BigDecimal(Double.toString(v1));
+        BigDecimal b2 = new BigDecimal(Double.toString(v2));
+        return b1.multiply(b2).doubleValue();
+    }
 }

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

@@ -18,4 +18,6 @@ public class PsqAnswerVo {
     private String answer;//答案
 
     private Integer answered;//试卷是否设置正确答案1已设置0未设置
+
+    private Integer costtime;//话费时间
 }

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

@@ -99,6 +99,4 @@
         from e_subject es left join e_paper ep on es.esid=ep.esid
         left join e_base e on es.examid=e.examid where es.esid=#{esid}
     </select>
-
-    <select id="getExamState"></select>
 </mapper>

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

@@ -4,8 +4,16 @@
 
     <!--根据学生试题id获取试题正确答案-->
     <select id="getPaperQuestionAnswer" resultType="com.xhkjedu.sexam.vo.paperstudent.PsqAnswerVo">
-        select psq.eptqid,ptq.ctype,ptq.score,ptq.answer,p.answered
+        select psq.eptqid,psq.costtime,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>
+
+    <!--提交单题-->
+    <update id="updateStuAnswer">
+        update e_paper_student_question set answered=#{q.answered},answertype=#{q.answertype},
+        stuanswer=#{q.stuanswer},stuanswertxt=#{q.stuanswertxt},converted=#{q.converted},
+        answertime=#{q.answertime},costtime=#{q.costtime},stuscore=#{q.stuscore},
+        checked=#{q.checked},checkid=#{q.checkid},checktime=#{q.checktime} where epsqid=#{q.epsqid}
+    </update>
 </mapper>