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

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

@@ -67,15 +67,15 @@ public class EPaperStudentService {
         return ePaperStudentMapper.listExamPapersForStudent(eps.getStudentid());
     }
 
-    public Map getExamSubjectPaperByEpsid(Integer epsid){
+    public Map getExamSubjectPaperByEpsid(Integer epsid) {
         Map map = ePaperStudentMapper.getExamSubjectPaperByEpsid(epsid);
         Long times = null;
-        if(map.get("sdate")!=null && map.get("begintime")!=null && map.get("endtime")!=null){
+        if (map.get("sdate") != null && map.get("begintime") != null && map.get("endtime") != null) {
             long bg = ExamUtil.strToTimestamp(map.get("sdate").toString() + " " + map.get("begintime").toString() + ":00");
             long ed = ExamUtil.strToTimestamp(map.get("sdate").toString() + " " + map.get("endtime").toString() + ":00");
-            times = ExamUtil.subtract(ed,bg);
+            times = ExamUtil.subtract(ed, bg);
         }
-        map.put("times",times);
+        map.put("times", times);
         return map;
     }
 
@@ -125,14 +125,14 @@ public class EPaperStudentService {
                 questions = ePaperStudentMapper.listStuPaperFjQuestionsForAndroid(epsid);
             }
         }
-        if(ptype == 2){
+        if (ptype == 2) {
             List<Map> files = ePaperFileMapper.listPaperFiles(psvo.getEpid());
-            map.put("files",files);
+            map.put("files", files);
         }
 
-        ePaperStudentMapper.updateStuStartime(epsid,N_Utils.getSecondTimestamp());
-        map.put("paper",psvo);
-        map.put("questions",questions);
+        ePaperStudentMapper.updateStuStartime(epsid, N_Utils.getSecondTimestamp());
+        map.put("paper", psvo);
+        map.put("questions", questions);
         return map;
     }
 
@@ -200,12 +200,12 @@ public class EPaperStudentService {
             }
         }
 
-        if(ptype==2){
+        if (ptype == 2) {
             List<Map> files = ePaperFileMapper.listPaperFiles(psvo.getEpid());
             psvo.setFiles(files);
         }
         psvo.setQtypelist(questions);
-        ePaperStudentMapper.updateStuStartime(epsid,N_Utils.getSecondTimestamp());
+        ePaperStudentMapper.updateStuStartime(epsid, N_Utils.getSecondTimestamp());
         return psvo;
     }
 
@@ -220,17 +220,17 @@ public class EPaperStudentService {
         try {
             //学生作答提交时先判断试卷是否设置的正确答案
             PsqAnswerVo answerVo = ePaperStudentQuestionMapper.getPaperQuestionAnswer(psq.getEpsqid());
-            setCommitQuestion(psq,answerVo);
+            setCommitQuestion(psq, answerVo);
             ePaperStudentQuestionMapper.updateStuAnswer(psq);
-        }catch (Exception e){
-            log.error("提交试题失败："+e.getMessage());
+        } catch (Exception e) {
+            log.error("提交试题失败：" + e.getMessage());
             throw new Exception("提交试题失败");
         }
 
     }
 
     //判断单道题情况
-    private void setCommitQuestion(EPaperStudentQuestion psq,PsqAnswerVo answerVo){
+    private void setCommitQuestion(EPaperStudentQuestion psq, PsqAnswerVo answerVo) {
         int timestamp = N_Utils.getSecondTimestamp();
         psq.setAnswertime(timestamp);
         int coverted = 1;//是否转换0未转换1已转换2转换失败
@@ -238,94 +238,94 @@ public class EPaperStudentService {
         List<String> stuanswers = JSON.parseArray(stuanswer, String.class);
         Double stuscore = 0D;
 
-        if(N_Utils.isListEmpty(stuanswers) && N_Utils.isEmpty(psq.getStuanswertxt())
-                && N_Utils.isEmpty(psq.getStuanswertxt())){
+        if (N_Utils.isListEmpty(stuanswers) && N_Utils.isEmpty(psq.getStuanswertxt())
+                && N_Utils.isEmpty(psq.getStuanswertxt())) {
             psq.setStuscore(stuscore);
             psq.setChecked(2);
             psq.setChecktime(timestamp);
             psq.setAnswered(0);
-        }else{
+        } else {
             //试卷已经设置了正确答案
-            if (answerVo.getAnswered() == 1){
+            if (answerVo.getAnswered() == 1) {
                 String qanswer = answerVo.getAnswer();
-                List<String> qanswers = JSON.parseArray(qanswer,String.class);
+                List<String> qanswers = JSON.parseArray(qanswer, String.class);
                 int ctype = answerVo.getCtype();
-                if(psq.getAnswertype() == 1){
-                    if(N_Utils.isObjectiveQuestion(ctype)){
+                if (psq.getAnswertype() == 1) {
+                    if (N_Utils.isObjectiveQuestion(ctype)) {
                         //客观题进行批阅
-                        if(ctype == 1 || ctype == 4 || ctype == 5 || ctype == 6){
+                        if (ctype == 1 || ctype == 4 || ctype == 5 || ctype == 6) {
                             //单选、判断
-                            if(stuanswer.equalsIgnoreCase(qanswer)) {
+                            if (stuanswer.equalsIgnoreCase(qanswer)) {
                                 stuscore = answerVo.getScore();
                             }
-                        }else if(ctype == 2){//多选
+                        } else if (ctype == 2) {//多选
                             //多选、选错不得分
-                            if(stuanswers.get(0).length() <= qanswer.length()){
+                            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){
+                                for (String sa : stuanswerList) {
                                     int right = 0;
-                                    for(String qa : qanswerList){
-                                        if(qa.equals(sa)){
+                                    for (String qa : qanswerList) {
+                                        if (qa.equals(sa)) {
                                             right = 1;
-                                            rightNum ++;
+                                            rightNum++;
                                         }
                                     }
-                                    if(right == 0){//说明选错
+                                    if (right == 0) {//说明选错
                                         rightNum = 0;
                                         break;
                                     }
                                 }
-                                if(rightNum>0){
-                                    if(qanswerList.length == rightNum){
+                                if (rightNum > 0) {
+                                    if (qanswerList.length == rightNum) {
                                         //全选对
                                         stuscore = answerVo.getScore();
-                                    }else if (qanswerList.length > rightNum){
+                                    } else if (qanswerList.length > rightNum) {
                                         //少选得半分
-                                        stuscore = ExamUtil.div(answerVo.getScore(),2,1);
+                                        stuscore = ExamUtil.div(answerVo.getScore(), 2, 1);
                                     }
                                 }
                             }
-                        }else if(ctype == 7 || ctype == 8 || ctype == 10){
+                        } else if (ctype == 7 || ctype == 8 || ctype == 10) {
                             //完形填空、阅读理解、任务型阅读
-                            Double qscore = ExamUtil.div(answerVo.getScore(),qanswers.size());
+                            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);
+                            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);
+                            stuscore = ExamUtil.round(stuScoreDouble, 1);
                         }
-                        if(stuscore.compareTo(answerVo.getScore()) == 1){
+                        if (stuscore.compareTo(answerVo.getScore()) == 1) {
                             stuscore = answerVo.getScore();
                         }
 
                         psq.setChecked(2);
                         psq.setChecktime(timestamp);
-                    }else{
-                        if(stuanswers.size() > 1){
+                    } else {
+                        if (stuanswers.size() > 1) {
                             coverted = 0;//上传的多张图片设为0未转换
                         }
                         psq.setChecked(0);
                     }
-                }else{
+                } else {
                     psq.setChecked(0);
                 }
-            }else{
+            } else {
                 psq.setStuscore(stuscore);
                 psq.setChecked(0);
             }
         }
         psq.setStuscore(stuscore);
         Integer costtime = answerVo.getCosttime();
-        if(costtime == null){
+        if (costtime == null) {
             costtime = 0;
         }
-        if(psq.getCosttime() == null){
+        if (psq.getCosttime() == null) {
             psq.setCosttime(costtime);
-        }else{
+        } else {
             psq.setCosttime(psq.getCosttime());
         }
 
@@ -340,9 +340,9 @@ public class EPaperStudentService {
      * @Date 2022/7/28 16:59
      **/
     @Transactional(rollbackFor = Exception.class)
-    public void saveCommitPaper(Integer epsid){
+    public void saveCommitPaper(Integer epsid) {
         EPaperStudent ps = ePaperStudentMapper.selectByPrimaryKey(epsid);
-        if(ps == null || ps.getSstate() == 2){
+        if (ps == null || ps.getSstate() == 2) {
             return;
         }
         EPaperStudent paperStudent = new EPaperStudent();
@@ -355,22 +355,22 @@ public class EPaperStudentService {
         //获取试卷中未批阅试题数量
         int noCheckNum = ePaperStudentQuestionMapper.getStuQuestionNoCheckNum(epsid);
         int checked = 0;
-        if(noCheckNum == 0){
+        if (noCheckNum == 0) {
             checked = 2;//试卷中所有试题都批完后标识试卷已批改
         }
         paperStudent.setChecked(checked);
         ePaperStudentMapper.updateStudentPaper(paperStudent);//修改试卷信息
-        chandleStudentQuestionNoconvertedPic(epsid,1);//处理试卷中多张图片未合并情况
+        chandleStudentQuestionNoconvertedPic(epsid, 1);//处理试卷中多张图片未合并情况
     }
 
     //处理试卷中未已提交需要合并的图片,type1代表线上2代表扫码答题卡图片
-    private void chandleStudentQuestionNoconvertedPic(Integer epsid,Integer type){
+    private void chandleStudentQuestionNoconvertedPic(Integer epsid, Integer type) {
         List<EPaperStudentQuestion> psqlist = ePaperStudentQuestionMapper.listStuQuesitonStuAnswerPic(epsid);
-        if(N_Utils.isListNotEmpty(psqlist)){
-            for(EPaperStudentQuestion sq : psqlist){
-                List<String> stuanswer = JSON.parseArray(sq.getStuanswer(),String.class);
-                if(N_Utils.isListNotEmpty(stuanswer) && stuanswer.size()>1){
-                    convertUtil.imgMerge(sq.getEpsqid(),stuanswer,type);
+        if (N_Utils.isListNotEmpty(psqlist)) {
+            for (EPaperStudentQuestion sq : psqlist) {
+                List<String> stuanswer = JSON.parseArray(sq.getStuanswer(), String.class);
+                if (N_Utils.isListNotEmpty(stuanswer) && stuanswer.size() > 1) {
+                    convertUtil.imgMerge(sq.getEpsqid(), stuanswer, type);
                 }
             }
         }
@@ -383,25 +383,25 @@ public class EPaperStudentService {
      * @Author wn
      * @Date 2022/7/28 19:18
      **/
-    public void saveCommitPaperForWeb(PaperStudentWebVo pswvo){
+    public void saveCommitPaperForWeb(PaperStudentWebVo pswvo) {
         List<EPaperStudentQuestion> sqlist = pswvo.getQuestions();//学生提交试卷中试题
         EPaperStudent ps = ePaperStudentMapper.selectByPrimaryKey(pswvo.getEpsid());
         //试卷不存在或者已提交
-        if(ps == null || ps.getSstate() == 2){
+        if (ps == null || ps.getSstate() == 2) {
             return;
         }
         //获取试卷中所有试题答案及分值
         List<PsqAnswerVo> anvolist = ePaperStudentQuestionMapper.listPaperQuestionsAnswer(pswvo.getEpsid());
         Integer checknum = 0;//记录试卷中试题批阅数量
         Double paperscore = 0D;//学生试卷得分
-        for(EPaperStudentQuestion q : sqlist){
+        for (EPaperStudentQuestion q : sqlist) {
 
             //获取该试题正确答案
             PsqAnswerVo anvo = anvolist.stream().filter(a -> a.getEpsqid().equals(q.getEpsqid())).findFirst().orElse(null);
 
-            setCommitQuestion(q,anvo);
-            if(q.getChecked() == 2){
-                checknum ++;
+            setCommitQuestion(q, anvo);
+            if (q.getChecked() == 2) {
+                checknum++;
             }
             paperscore = ExamUtil.add(paperscore, q.getStuscore());
         }
@@ -411,7 +411,7 @@ public class EPaperStudentService {
         paperStudent.setSstate(2);
         paperStudent.setStuscore(paperscore);
         int checked = 0;
-        if(checknum == sqlist.size()){
+        if (checknum == sqlist.size()) {
             checked = 2;
         }
         paperStudent.setChecked(checked);
@@ -420,7 +420,7 @@ public class EPaperStudentService {
         ePaperStudentMapper.updateStudentPaper(paperStudent);
 
         //获取试卷中需要合并图片的试题
-        chandleStudentQuestionNoconvertedPic(pswvo.getEpsid(),1);
+        chandleStudentQuestionNoconvertedPic(pswvo.getEpsid(), 1);
     }
 
     /**
@@ -431,7 +431,7 @@ public class EPaperStudentService {
      * @Date 2022/8/3 9:17
      **/
     @Transactional(rollbackFor = Exception.class)
-    public void saveCommitPaperForScantron(PaperStudentWebVo pswvo) throws Exception{
+    public void saveCommitPaperForScantron(PaperStudentWebVo pswvo) throws Exception {
 
         //扫描一次扫描数量+1
         eScanbatchMapper.updateScannum(pswvo.getBatchid());
@@ -473,7 +473,7 @@ public class EPaperStudentService {
     }
 
     //更新扫描出错信息
-    private void updateScanErrorInfo(Integer errortype,PaperStudentWebVo pswvo){
+    private void updateScanErrorInfo(Integer errortype, PaperStudentWebVo pswvo) {
         //识别出错
         EScanerror er = new EScanerror();
         er.setBatchid(pswvo.getBatchid());
@@ -507,103 +507,93 @@ public class EPaperStudentService {
      * @Author wn
      * @Date 2022/8/12 10:45
      **/
-    public Map getStudentPaperScore(Integer epsid){
+    public Map getStudentPaperScore(Integer epsid) {
         Map paper = ePaperStudentMapper.getStudentPaperScore(epsid);
         Integer ptype = Integer.parseInt(paper.get("ptype").toString());
         Integer epid = Integer.parseInt(paper.get("epid").toString());
         List<Map> qtypeques = null;
-        if(ptype == 1){
+        if (ptype == 1) {
             qtypeques = ePaperStudentQuestionMapper.listQStuQuestionScore(epsid);
             setQuestionsForPaper(qtypeques);
-        }else{
+        } else {
             qtypeques = ePaperStudentQuestionMapper.listFjStuQuestionScore(epsid);
             List<Map> files = ePaperFileMapper.listPaperFiles(epid);
-            paper.put("files",files);
+            paper.put("files", files);
         }
-        paper.put("qtypes",qtypeques);
+        paper.put("qtypes", qtypeques);
         return paper;
     }
 
-    private void setQuestionsForPaper(List<Map> qtypes){
-        for(Map mt : qtypes){
-            Integer ctype = Integer.parseInt(mt.get("ctype").toString());
-            List<Map> mqlist = new ArrayList<>();
-            if(ctype == 11 || ctype == 16 || ctype == 17){
-                //符合题、完形填空、任务型阅读
-                List<Map> questions = (List<Map>) mt.get("questions");
-                Map<String,List<Map>> quemap = questions.stream().collect(Collectors.groupingBy(o -> o.get("questionpid").toString()));
-
-                for(Map.Entry<String,List<Map>> entry : quemap.entrySet()){
-                    List<Map> sonqlst = entry.getValue();
-                    Double sontotalsocre = sonqlst.stream().mapToDouble(o -> Double.parseDouble(o.get("score").toString())).sum();
-                    Double stuscore = sonqlst.stream().mapToDouble(o -> Double.parseDouble(o.get("stuscore").toString())).sum();
-                    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()));
-                    Integer hashear = Integer.parseInt(sque.get("mhashear").toString());
-                    mque.put("hashear",hashear);
-                    if(ctype == 12 && hashear==1){
-                        mque.put("hearfile",sque.get("mhearfile").toString());
-                    }else{
-                        mque.put("hearfile","");
-                    }
-                    mque.put("score",sontotalsocre);
-                    mque.put("sonques",sonqlst);
-                    mque.put("stuscore",stuscore);
-                    mqlist.add(mque);
-                }
-            }else if(ctype == 12){
-                //听力题，包含单题和复合题
-                List<Map> questions = (List<Map>) mt.get("questions");
-                List<String> questionpids = new ArrayList<>();
-                for(Map q : questions){
-                    Integer qlevel = Integer.parseInt(q.get("qlevel").toString());
-                    if(qlevel == 1){
-                        mqlist.add(q);
-                    }else{
-                        String questionpid = q.get("questionpid").toString();
-                        if(!questionpids.contains(questionpid)){
-                            questionpids.add(questionpid);
-
-                            List<Map> sonques = questions.stream().filter(s -> qlevel.equals(Integer.parseInt(s.get("qlevel").toString())) && questionpid.equals(s.get("questionpid").toString())).collect(Collectors.toList());
-                            Double sontotalsocre = sonques.stream().mapToDouble(o -> Double.parseDouble(o.get("score").toString())).sum();
-                            Double stuscore = sonques.stream().mapToDouble(o -> Double.parseDouble(o.get("stuscore").toString())).sum();
-                            Map mque = new HashMap();
-                            mque.put("questionid",questionpid);
-                            mque.put("qlevel",2);
-                            mque.put("qstem",q.get("mqstem").toString());
-                            mque.put("ctype",Integer.parseInt(q.get("mctype").toString()));
-                            mque.put("qtypeid",q.get("mqtypeid").toString());
-                            mque.put("qtypename",q.get("mqtypename").toString());
-                            mque.put("qorder",q.get("qorder").toString());
-                            mque.put("qn",q.get("qn").toString());
-                            mque.put("snum",Integer.parseInt(q.get("snum").toString()));
-                            Integer hashear = Integer.parseInt(q.get("mhashear").toString());
-                            mque.put("hashear",hashear);
-                            if(ctype == 12 && hashear == 1){
-                                mque.put("hearfile",q.get("mhearfile").toString());
-                            }else{
-                                mque.put("hearfile","");
-                            }
-                            mque.put("score",sontotalsocre);
-                            mque.put("stuscore",stuscore);
-                            mque.put("sonques",sonques);
-                            mqlist.add(mque);
+    //这只试卷中母子题
+    private void setQuestionsForPaper(List<Map> qtypes) {
+        for (Map mt : qtypes) {
+            List<Map> questions = (List<Map>) mt.get("questions");
+            List<Map> mqlist = new ArrayList<>();//存放母子题结构试题
+            List<String> mtquestionids = new ArrayList<>();//存放母题的id
+            for (Map qmap : questions) {
+                Integer qlevel = Integer.parseInt(qmap.get("qlevel").toString());
+                if (qlevel == 1) {
+                    //单题
+                    qmap.remove("mqstem");
+                    qmap.remove("mqoption");
+                    qmap.remove("msum");
+                    qmap.remove("mqtypeid");
+                    qmap.remove("mqtypename");
+                    qmap.remove("mhashear");
+                    qmap.remove("mhearfile");
+                    qmap.remove("mquestionid");
+                    qmap.remove("mctype");
+                    qmap.remove("questionpid");
+
+                    mqlist.add(qmap);
+                } else {
+                    //子题
+                    String questionpid = qmap.get("questionpid").toString();
+                    if (!mtquestionids.contains(questionpid)) {
+                        mtquestionids.add(questionpid);
+                        List<Map> sonqueslist =
+                                questions.stream().filter(s -> qlevel.equals(Integer.parseInt(s.get("qlevel").toString())) && questionpid.equals(s.get("questionpid").toString())).collect(Collectors.toList());
+
+                        Double sontotalsocre = sonqueslist.stream().mapToDouble(o -> Double.parseDouble(o.get("score").toString())).sum();
+                        Double stuscore = sonqueslist.stream().mapToDouble(o -> Double.parseDouble(o.get("stuscore").toString())).sum();
+                        Map sque = sonqueslist.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()));
+                        Integer hashear = Integer.parseInt(sque.get("mhashear").toString());
+                        mque.put("hashear", hashear);
+                        if (hashear == 1) {
+                            mque.put("hearfile", sque.get("mhearfile").toString());
+                        } else {
+                            mque.put("hearfile", "");
+                        }
+                        mque.put("score", sontotalsocre);
+                        mque.put("stuscore", stuscore);
+
+                        for(Map sonquem : sonqueslist){
+                            sonquem.remove("mqstem");
+                            sonquem.remove("mqoption");
+                            sonquem.remove("msum");
+                            sonquem.remove("mqtypeid");
+                            sonquem.remove("mqtypename");
+                            sonquem.remove("mhashear");
+                            sonquem.remove("mhearfile");
+                            sonquem.remove("mquestionid");
+                            sonquem.remove("mctype");
+                            sonquem.remove("hashear");
+                            sonquem.remove("hearfile");
                         }
+                        mque.put("sonques", sonqueslist);
+                        mqlist.add(mque);
                     }
                 }
-
-            }else{
-                List<Map> questions = (List<Map>) mt.get("questions");
-                mqlist.addAll(questions);
             }
             mt.put("questions",mqlist);
         }
@@ -719,7 +709,7 @@ public class EPaperStudentService {
             }
             q.setEpsqid(anvo.getEpsqid());
             paperscore = ExamUtil.add(paperscore, q.getStuscore());
-            if(N_Utils.isObjectiveQuestion(q.getCtype()) && q.getAnswered()!=null && q.getAnswered()==1){
+            if (N_Utils.isObjectiveQuestion(q.getCtype()) && q.getAnswered() != null && q.getAnswered() == 1) {
                 rtnanswernum++;
             }
         }
@@ -782,7 +772,7 @@ public class EPaperStudentService {
     @Transactional(rollbackFor = Exception.class)
     public void qkConfirm(List<PaperStudentWebVo> list) throws Exception {
         List<EPaperStudent> pslist = new ArrayList<>();
-        for(PaperStudentWebVo objvo : list){
+        for (PaperStudentWebVo objvo : list) {
             EPaperStudent ps = new EPaperStudent();
             ps.setEpsid(objvo.getEpsid());
             ps.setSstate(objvo.getSstate());

sexam/src/main/java/com/xhkjedu/sexam/service/report/EReportStudentService.java

@@ -1,6 +1,7 @@
 package com.xhkjedu.sexam.service.report;
 
 import com.alibaba.fastjson.JSON;
+import com.sun.org.apache.xml.internal.utils.QName;
 import com.xhkjedu.sexam.mapper.exam.EBaseMapper;
 import com.xhkjedu.sexam.mapper.exam.EClassMapper;
 import com.xhkjedu.sexam.mapper.exam.ESubjectMapper;
@@ -180,7 +181,7 @@ public class EReportStudentService {
         List<Map> list = null;
         if (ptype == 1) {
             list = eRstudentMapper.listStudentQuestionsTk(epid, studentid);
-            setPaperQuestionForTK(list);
+            list = setPaperQuestionForTK(list);
         } else {
             list = eRstudentMapper.listStudentQuestionsFj(epid, studentid);
             for (Map qmap : list) {
@@ -203,49 +204,21 @@ public class EReportStudentService {
             Integer qlevel = Integer.parseInt(q.get("qlevel").toString());
             if (qlevel == 1) {
                 //代表单题
-                Map map = new HashMap();
-                map.put("epsqid", Integer.parseInt(q.get("epsqid").toString()));
-                map.put("eptqid", Integer.parseInt(q.get("eptqid").toString()));
-                map.put("ctype", Integer.parseInt(q.get("ctype").toString()));
-                map.put("qn", q.get("qn").toString());
-                map.put("qorder", Integer.parseInt(q.get("qorder").toString()));
                 Double stuscore = Double.parseDouble(q.get("stuscore").toString());
                 Double pscore = Double.parseDouble(q.get("qscore").toString());
-                map.put("qscore", pscore);
-                map.put("stuscore", stuscore);
-                map.put("answered", Integer.parseInt(q.get("answered").toString()));
-                map.put("answertype", Integer.parseInt(q.get("answertype").toString()));
-                map.put("stuanswer", q.get("stuanswer").toString());
-                map.put("stuanswertxt", q.get("stuanswertxt").toString());
-                map.put("answer", q.get("answer").toString());
-                map.put("qstem", q.get("qstem").toString());
-                if (N_Utils.isNotEmpty(q.get("qoption"))) {
-                    map.put("qoption", q.get("qoption").toString());
-                } else {
-                    map.put("qoption", "");
-                }
-                if (N_Utils.isNotEmpty(q.get("qanalyze"))) {
-                    map.put("qanalyze", q.get("qanalyze").toString());
-                } else {
-                    map.put("qanalyze", "");
-                }
-
-                Integer hashear = Integer.parseInt(q.get("hashear").toString());
-                map.put("hashear", hashear);
-                if (hashear == 1) {
-                    map.put("hearfile", q.get("hearfile").toString());
-                }
+                q.put("srate", N_Utils.getDoubleDivideAndMulitiply(stuscore, pscore));//得分率
 
-                map.put("qlevel", qlevel);
-                map.put("classavgscore", Double.parseDouble(q.get("classavgscore").toString()));
-                map.put("gradeavgscore", Double.parseDouble(q.get("gradeavgscore").toString()));
-                map.put("srate", N_Utils.getDoubleDivideAndMulitiply(stuscore, pscore));//得分率
-
-                if (q.get("points") != null) {
-                    List<Map> points = (List<Map>) q.get("points");
-                    map.put("points", points);
-                }
-                rtnlist.add(map);
+                q.remove("mqstem");
+                q.remove("mqoption");
+                q.remove("msum");
+                q.remove("mqtypeid");
+                q.remove("mqtypename");
+                q.remove("mhashear");
+                q.remove("mhearfile");
+                q.remove("mquestionid");
+                q.remove("mctype");
+                q.remove("questionpid");
+                rtnlist.add(q);
             } else {
                 //母题
                 String questionpid = q.get("questionpid").toString();
@@ -288,7 +261,23 @@ public class EReportStudentService {
 
                     Double stuscore = sonqueslist.stream().mapToDouble(s -> Double.parseDouble(s.get("stuscore").toString())).sum();
                     Double pscore = sonqueslist.stream().mapToDouble(s -> Double.parseDouble(s.get("qscore").toString())).sum();
+                    mq.put("qscore",pscore);
+                    mq.put("stuscore",stuscore);
                     mq.put("srate", N_Utils.getDoubleDivideAndMulitiply(stuscore, pscore));
+                    for(Map sonmap : sonqueslist){
+                        sonmap.remove("mqstem");
+                        sonmap.remove("msum");
+                        sonmap.remove("mqoption");
+                        sonmap.remove("mqtypeid");
+                        sonmap.remove("mqtypename");
+                        sonmap.remove("mhashear");
+                        sonmap.remove("mhearfile");
+                        sonmap.remove("mquestionid");
+                        sonmap.remove("mctype");
+                        sonmap.remove("points");
+                        sonmap.remove("hashear");
+                        sonmap.remove("hearfile");
+                    }
                     mq.put("sonques", sonqueslist);
                     rtnlist.add(mq);
                 }

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

@@ -164,9 +164,9 @@
             <result column="qtypename" property="qtypename"></result>
             <result column="qctype" property="ctype"></result>
             <result column="hashear" property="hashear"></result>
-            <result column="qctype" property="ctype"></result>
             <result column="hearfile" property="hearfile"></result>
             <result column="qoption" property="qoption"></result>
+            <result column="qstem" property="qstem"></result>
             <result column="qlevel" property="qlevel"></result>
             <result column="sorder" property="sorder"></result>
             <result column="snum" property="snum"></result>