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

src/main/java/com/xhkjedu/service/EPaperVerifyService.java

@@ -137,77 +137,94 @@ public class EPaperVerifyService {
             psq.setAnswered(0);
         } else {
             List<String> stuanswers = JSON.parseArray(stuanswer, String.class);
-            String qanswer = answerVo.getAnswer();
-            List<String> qanswers = JSON.parseArray(qanswer, String.class);
-            int ctype = answerVo.getCtype();
-            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(stuanswers.get(0).equals("null") || "".equals(stuanswers.get(0))){
+                //说明是空
+                psq.setAnswered(0);
+                psq.setStuanswer(null);
+                psq.setStuanswertxt(null);
+                psq.setStuscore(stuscore);
+                psq.setChecked(2);
+                psq.setChecktime(timestamp);
+                psq.setAnswered(0);
+            }else{
+                String qanswer = answerVo.getAnswer();
+                List<String> qanswers = JSON.parseArray(qanswer, String.class);
+                int ctype = answerVo.getCtype();
+                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 = N_Utils.div(answerVo.getScore(), 2, 1);
+                                if (rightNum > 0) {
+                                    if (qanswerList.length == rightNum) {
+                                        //全选对
+                                        stuscore = answerVo.getScore();
+                                    } else if (qanswerList.length > rightNum) {
+                                        //少选得半分
+                                        stuscore = N_Utils.div(answerVo.getScore(), 2, 1);
+                                    }
                                 }
                             }
                         }
+                        psq.setChecked(2);
+                        psq.setChecktime(timestamp);
+                    } else {
+                        psq.setChecked(0);
                     }
-                    psq.setChecked(2);
-                    psq.setChecktime(timestamp);
                 } else {
-                    psq.setChecked(0);
-                }
-            } else {
-                if(N_Utils.isNotEmpty(stuanswertxt)){
-                    List<String> stuanswertxt_list = JSON.parseArray(stuanswertxt,String.class);
-                    String stuanswertxt_txt = stuanswertxt_list.get(0);
-                    if(N_Utils.isNotEmpty(stuanswertxt_txt)){
-                        stuanswertxt_txt = N_Utils.strTrim(stuanswertxt_txt);
+                    if(N_Utils.isNotEmpty(stuanswertxt)){
+                        List<String> stuanswertxt_list = JSON.parseArray(stuanswertxt,String.class);
+                        String stuanswertxt_txt = stuanswertxt_list.get(0);
                         if(N_Utils.isNotEmpty(stuanswertxt_txt)){
-                            psq.setChecked(0);
-                            List<String> stuanswertxt_list_new = new ArrayList<>();
-                            stuanswertxt_list_new.add(stuanswertxt_txt);
-                            psq.setStuanswertxt(JSON.toJSONString(stuanswertxt_list_new));
+                            stuanswertxt_txt = N_Utils.strTrim(stuanswertxt_txt);
+                            if(N_Utils.isNotEmpty(stuanswertxt_txt)){
+                                psq.setChecked(0);
+                                List<String> stuanswertxt_list_new = new ArrayList<>();
+                                stuanswertxt_list_new.add(stuanswertxt_txt);
+                                psq.setStuanswertxt(JSON.toJSONString(stuanswertxt_list_new));
+                            }else{
+                                psq.setChecked(2);
+                                psq.setStuanswertxt("[\"\"]");
+                            }
                         }else{
                             psq.setChecked(2);
                             psq.setStuanswertxt("[\"\"]");
                         }
                     }else{
                         psq.setChecked(2);
-                        psq.setStuanswertxt("[\"\"]");
                     }
-                }else{
-                    psq.setChecked(2);
                 }
+
+                String newStuAnswer = stuanswers.get(0).toUpperCase();
+                List<String> newStuAnswers = new ArrayList<>();
+                newStuAnswers.add(newStuAnswer);
+                psq.setStuanswer(JSON.toJSONString(newStuAnswers));
+
+                psq.setStuscore(stuscore);
+                psq.setAnswered(1);
             }
-            psq.setStuscore(stuscore);
-            psq.setAnswered(1);
         }
     }