网页端提交试卷

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

@@ -231,79 +231,88 @@ public class EPaperStudentService {
                 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 || ctype == 4 || ctype == 5 || ctype == 6){
-                            //单选、判断
-                            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(psq.getAnswertype() == 1){
+                        if(N_Utils.isObjectiveQuestion(ctype)){
+                            //客观题进行批阅
+                            if(ctype == 1 || ctype == 4 || ctype == 5 || ctype == 6){
+                                //单选、判断
+                                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(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);
+                                        }
                                     }
                                 }
-                                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);
                             }
-                        }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);
-                                }
+                            if(stuscore.compareTo(answerVo.getScore()) == 1){
+                                stuscore = answerVo.getScore();
                             }
-                            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.setChecked(2);
+                            psq.setChecktime(timestamp);
+                        }else{
+                            if(stuanswers.size() > 1){
+                                coverted = 0;//上传的多张图片设为0未转换
+                            }
+                            psq.setChecked(0);
                         }
                     }
-                    psq.setAnswered(1);
+                    psq.setAnswered(0);
+                    psq.setChecked(0);
                 }
             }
         }
-
+        psq.setStuscore(stuscore);
         Integer costtime = answerVo.getCosttime();
         if(costtime == null){
             costtime = 0;
         }
-        psq.setCosttime(psq.getCosttime() + costtime);
+        if(psq.getCosttime() == null){
+            psq.setCosttime(costtime);
+        }else{
+            psq.setCosttime(psq.getCosttime());
+        }
+
         psq.setConverted(coverted);
     }
 
@@ -372,7 +381,7 @@ public class EPaperStudentService {
         for(EPaperStudentQuestion q : sqlist){
 
             //获取该试题正确答案
-            PsqAnswerVo anvo = anvolist.stream().filter(a -> a.getEptqid().equals(q.getEptqid())).findFirst().orElse(null);
+            PsqAnswerVo anvo = anvolist.stream().filter(a -> a.getEpsqid().equals(q.getEpsqid())).findFirst().orElse(null);
 
             setCommitQuestion(q,anvo);
             if(q.getChecked() == 2){

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

@@ -18,7 +18,7 @@
     <!--获取考试班级任教老师-->
     <select id="listTeacherByClassIds" resultType="com.xhkjedu.sexam.vo.system.UserVo">
         select u.userid,u.userphone
-        from t_class_teacher ct left join t_user u on ct.studentid = u.userid
+        from t_class_teacher ct left join t_user u on ct.teacherid = u.userid
         where ct.classid in(${classids}) and u.userstate=1
         group by u.userid
     </select>