优化小题分析，错题集

scommons/src/main/java/com/xhkjedu/utils/N_Utils.java

@@ -9,6 +9,7 @@ import java.io.IOException;
 import java.io.InputStreamReader;
 import java.io.OutputStreamWriter;
 import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.net.URL;
 import java.net.URLConnection;
 import java.text.ParseException;
@@ -648,6 +649,22 @@ public class N_Utils {
         return num2;
     }
 
+    /**
+     * @Description  格式化double类型，如果未小数点后为0反正整式，
+     * @Param [score]
+     * @Return java.lang.String
+     * @Author wn
+     * @Date 2022/9/2 16:34
+     **/
+    public static String formatDouble(Double score){
+        BigDecimal bg = new BigDecimal(score).setScale(1, RoundingMode.HALF_DOWN);
+        double num = bg.doubleValue();
+        if (Math.round(num) - num == 0) {
+            return String.valueOf((long) num);
+        }
+        return String.valueOf(num);
+    }
+
     /**
      * 格式化百分比
      * @Param [arr]

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

@@ -94,4 +94,7 @@ public class EPaperStudentQuestion extends BaseBean {
     @Transient
     private String checkname;//批阅人
 
+    @Transient
+    private String answer;//试题正确答案
+
 }

sexam/src/main/java/com/xhkjedu/sexam/model/reportclass/ERclassQuestion.java

@@ -58,6 +58,9 @@ public class ERclassQuestion extends BaseBean {
     //年级得分率
     private Double gradesrate;
 
+    //高频错误选项
+    private String erroroption;
+
     //学生作答情况
     private String answerjson;
 

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

@@ -299,6 +299,7 @@ public class EPaperQtypeService {
             tmap.put("num",qt.getEptnum());
             tmap.put("score",qt.getEptscore());
             tmap.put("srate",storerate);
+            qtypeqlist = qtypeqlist.stream().sorted(Comparator.comparing(QuestionOrderVo::getOrder)).collect(Collectors.toList());
             tmap.put("ques",qtypeqlist);
             typelist.add(tmap);
         }
@@ -341,7 +342,7 @@ public class EPaperQtypeService {
                 prate.put("level",Integer.parseInt(entry.getKey()));
                 prate.put("score",score);
                 prate.put("srate",srate);
-                prate.put("ques",pgblist);
+                prate.put("ques",pgblist.stream().sorted(Comparator.comparing(QuestionOrderVo::getOrder)).collect(Collectors.toList()));
                 clist.add(prate);
             }
         }
@@ -361,7 +362,7 @@ public class EPaperQtypeService {
                 prate.put("pointname",pgblist.get(0).getName());
                 prate.put("score",score);
                 prate.put("srate",srate);
-                prate.put("ques",pgblist);
+                prate.put("ques",pgblist.stream().sorted(Comparator.comparing(QuestionOrderVo::getOrder)).collect(Collectors.toList()));
                 pointlist.add(prate);
             }
         }

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

@@ -319,8 +319,8 @@ public class EReportGenerateService {
         Map<String, List<ERclass>> collect = classList.stream().collect(Collectors.groupingBy(c -> c.getSubjectid()));
         for (Map.Entry<String, List<ERclass>> centry : collect.entrySet()) {
             List<Map.Entry<Double, List<ERclass>>> gslist2 = centry.getValue().stream()
-                    .collect(Collectors.groupingBy(ERclass::getClassavgscore)).entrySet()
-                    .stream().sorted((s1, s2) -> -Double.compare(s1.getKey(), s2.getKey())).collect(Collectors.toList());
+                                                                   .collect(Collectors.groupingBy(ERclass::getClassavgscore)).entrySet()
+                                                                   .stream().sorted((s1, s2) -> -Double.compare(s1.getKey(), s2.getKey())).collect(Collectors.toList());
             Integer index = 1;
             for (Map.Entry<Double, List<ERclass>> entry : gslist2) {
                 for (ERclass rc : entry.getValue()) {
@@ -373,9 +373,9 @@ public class EReportGenerateService {
                     int num = list.size();
                     subject.put("num", num);
                     subject.put("nrate", N_Utils.getIntegerDivideAndMulitiply(num, znum));
-                    List<Map> students=new ArrayList<>();
+                    List<Map> students = new ArrayList<>();
                     for (Map s : list) {
-                        Map stu=new HashMap();
+                        Map stu = new HashMap();
                         Integer studentid = (Integer) s.get("studentid");
                         stu.put("studentid", studentid);
                         stu.put("num", s.get("num"));
@@ -548,7 +548,7 @@ public class EReportGenerateService {
 
                     //班级科目统计
                     Map<Integer, List<ERstudent>> ccollect = students.stream().filter(s -> s.getSubjectid().equals(subjectid))
-                            .collect(Collectors.groupingBy(s -> s.getClassid()));
+                                                                     .collect(Collectors.groupingBy(s -> s.getClassid()));
                     for (Map.Entry<Integer, List<ERstudent>> entry : ccollect.entrySet()) {
                         classid = entry.getKey();
                         list = entry.getValue();
@@ -594,7 +594,7 @@ public class EReportGenerateService {
 
                     //班级科目统计
                     Map<Integer, List<ERstudent>> ccollect = students.stream().filter(s -> s.getSubjectid().equals(subjectid))
-                            .collect(Collectors.groupingBy(s -> s.getClassid()));
+                                                                     .collect(Collectors.groupingBy(s -> s.getClassid()));
                     for (Map.Entry<Integer, List<ERstudent>> entry : ccollect.entrySet()) {
                         classid = entry.getKey();
                         list = entry.getValue();
@@ -635,7 +635,7 @@ public class EReportGenerateService {
 
                 //班级科目统计
                 Map<Integer, List<ERstudent>> ccollect = students.stream().filter(s -> s.getSubjectid().equals(subjectid))
-                        .collect(Collectors.groupingBy(s -> s.getClassid()));
+                                                                 .collect(Collectors.groupingBy(s -> s.getClassid()));
                 for (Map.Entry<Integer, List<ERstudent>> entry : ccollect.entrySet()) {
                     classid = entry.getKey();
                     list = entry.getValue();
@@ -674,7 +674,7 @@ public class EReportGenerateService {
 
                 //班级科目统计
                 Map<Integer, List<ERstudent>> ccollect = students.stream().filter(s -> s.getSubjectid().equals(subjectid))
-                        .collect(Collectors.groupingBy(s -> s.getClassid()));
+                                                                 .collect(Collectors.groupingBy(s -> s.getClassid()));
                 for (Map.Entry<Integer, List<ERstudent>> entry : ccollect.entrySet()) {
                     classid = entry.getKey();
                     list = entry.getValue();
@@ -703,7 +703,7 @@ public class EReportGenerateService {
 
                 //班级科目统计
                 Map<Integer, List<ERstudent>> ccollect = students.stream().filter(s -> s.getSubjectid().equals(subjectid))
-                        .collect(Collectors.groupingBy(s -> s.getClassid()));
+                                                                 .collect(Collectors.groupingBy(s -> s.getClassid()));
                 for (Map.Entry<Integer, List<ERstudent>> entry : ccollect.entrySet()) {
                     classid = entry.getKey();
                     list = entry.getValue();
@@ -734,7 +734,7 @@ public class EReportGenerateService {
 
                 //班级科目统计
                 Map<Integer, List<ERstudent>> ccollect = students.stream().filter(s -> s.getSubjectid().equals(subjectid))
-                        .collect(Collectors.groupingBy(s -> s.getClassid()));
+                                                                 .collect(Collectors.groupingBy(s -> s.getClassid()));
                 for (Map.Entry<Integer, List<ERstudent>> entry : ccollect.entrySet()) {
                     classid = entry.getKey();
                     list = entry.getValue();
@@ -941,7 +941,7 @@ public class EReportGenerateService {
         cr.setStunum(stunum);
         cr.setSturate(N_Utils.getIntegerDivideAndMulitiply(stunum, gstunum));
         setStudentName(list2, userMap);
-        String stujson = list2.stream().map(s -> s.getStudentname()+"（"+s.getSchoolrank()+"名）").sorted().collect(Collectors.joining("、"));
+        String stujson = list2.stream().map(s -> s.getStudentname() + "（" + s.getSchoolrank() + "名）").sorted().collect(Collectors.joining("、"));
         cr.setStujson(stujson);
         rclassRankList.add(cr);
     }
@@ -979,8 +979,8 @@ public class EReportGenerateService {
     //分数排名
     private void setRank(List<ERstudent> students, Map<String, Integer> rank, Integer code) {
         List<Map.Entry<Double, List<ERstudent>>> gslist2 = students.stream()
-                .collect(Collectors.groupingBy(ERstudent::getScore)).entrySet()
-                .stream().sorted((s1, s2) -> -Double.compare(s1.getKey(), s2.getKey())).collect(Collectors.toList());
+                                                                   .collect(Collectors.groupingBy(ERstudent::getScore)).entrySet()
+                                                                   .stream().sorted((s1, s2) -> -Double.compare(s1.getKey(), s2.getKey())).collect(Collectors.toList());
         Integer index = 1;
         String key;
         for (Map.Entry<Double, List<ERstudent>> entry : gslist2) {
@@ -1003,12 +1003,11 @@ public class EReportGenerateService {
         }
     }
 
-
     @Transactional(rollbackFor = Exception.class)
-    public void saveClassQuestions(Integer examid){
+    public void saveClassQuestions(Integer examid) {
         List<Map> classes = eClassMapper.listByExamId(examid);
         List<Map> subjects = eReportGenerateMapper.listSubject(examid);
-        setClassQuestion(examid,subjects,classes);
+        setClassQuestion(examid, subjects, classes);
 
     }
 
@@ -1061,7 +1060,6 @@ public class EReportGenerateService {
             }
         }
 
-
         eRclassQtypeMapper.insertList(rtypelist);
         eRstudentQtypeMapper.insertList(stutypelist);
         eRclassQuestionMapper.insertList(rqueslist);
@@ -1075,7 +1073,7 @@ public class EReportGenerateService {
     private Map setPaperQuestionsForStuAnswer(List<EPaperStudentQuestion> classStu) {
         EPaperStudentQuestion q = classStu.get(0);//取第一条数据
 
-        Map<String, List<Map>> answermap = new HashMap<>();
+        Map<String, List<Map>> answermap = null;
         List<Map> goodlist = new ArrayList<>();
         List<Map> badlist = new ArrayList<>();
 
@@ -1092,11 +1090,15 @@ public class EReportGenerateService {
                 String answeroption = "未作答";
                 if (N_Utils.isNotEmpty(stuanswer)) {
                     List<String> stuanswers = JSON.parseArray(stuanswer, String.class);
-                    if(N_Utils.isListNotEmpty(stuanswers)){
+                    if (N_Utils.isListNotEmpty(stuanswers)) {
                         answeroption = stuanswers.get(0);
                     }
                 }
 
+                if(i == 0){
+                    answermap = new TreeMap<>();
+                }
+
                 Map stumap = new HashMap();
                 stumap.put("studentid", sq.getStudentid());
                 stumap.put("stuname", sq.getStuname());
@@ -1111,12 +1113,16 @@ public class EReportGenerateService {
             } else {
                 //主观题
                 if (i == 0) {
+                    answermap = new LinkedHashMap<>();
                     //处理分数分段对应,用于分数段[0，50%）   [50%，80%）,  [80%，100%]
                     score8 = ExamUtil.getScoreRateScore(q.getQscore(), 0.8);
-                    score5 = ExamUtil.getScoreRateScore(q.getQscore(), 0.8);
-                    key1 = score8 + "-" + q.getQscore();
-                    key2 = score8 + "-" + score5;
-                    key3 = score5 + "-" + 0;
+                    score5 = ExamUtil.getScoreRateScore(q.getQscore(), 0.5);
+                    String str10 = N_Utils.formatDouble(q.getQscore());
+                    String str8 = N_Utils.formatDouble(score8);
+                    String str5 = N_Utils.formatDouble(score5);
+                    key1 = str8 + "-" + str10;
+                    key2 = str5 + "-" + str8;
+                    key3 = 0 + "-" + str5;
                     answermap.put(key1, new ArrayList<>());
                     answermap.put(key2, new ArrayList<>());
                     answermap.put(key3, new ArrayList<>());
@@ -1151,10 +1157,37 @@ public class EReportGenerateService {
             }
         }
 
+        String erroroption = "";//高频错误项
+        if (q.getCtype() == 1 || q.getCtype() == 2 || q.getCtype() == 4 || q.getCtype() == 5 || q.getCtype() == 6) {
+            String answer = q.getAnswer();//试题正确答案
+            List<String> answerlist = JSON.parseArray(answer, String.class);
+            int num = 0;
+            for (Map.Entry<String, List<Map>> entry : answermap.entrySet()) {
+                if (!entry.getKey().equalsIgnoreCase(answerlist.get(0))) {
+                    //当前选项不是正确答案时,数量大的为高频错误选项
+                    if (num < entry.getValue().size()) {
+                        num = entry.getValue().size();
+                        erroroption = entry.getKey();
+                    }
+                }
+            }
+        }
+
         Map rtnmap = new HashMap();
         rtnmap.put("answerlist", JSON.toJSONString(answermap));
-        rtnmap.put("goodlist", JSON.toJSONString(goodlist));
+        if(goodlist.size()>0){
+            rtnmap.put("goodlist", JSON.toJSONString(goodlist));
+        }else{
+            rtnmap.put("goodlist", "");
+        }
+        if(badlist.size()>0){
+            rtnmap.put("badlist", JSON.toJSONString(badlist));
+        }else{
+            rtnmap.put("badlist", "");
+        }
+
         rtnmap.put("badlist", JSON.toJSONString(badlist));
+        rtnmap.put("erroroption",erroroption);
         return rtnmap;
     }
 
@@ -1224,8 +1257,14 @@ public class EReportGenerateService {
                     //处理单选题选项情况
                     Map stuansmap = setPaperQuestionsForStuAnswer(qcstulist);
                     ercq.setAnswerjson(stuansmap.get("answerlist").toString());
-                    ercq.setGoodstujson(stuansmap.get("goodlist").toString());
-                    ercq.setBadstujson(stuansmap.get("badlist").toString());
+                    if(N_Utils.isNotEmpty(stuansmap.get("goodlist"))){
+                        ercq.setGoodstujson(stuansmap.get("goodlist").toString());
+                    }
+                    if(N_Utils.isNotEmpty(stuansmap.get("badlist"))){
+                        ercq.setBadstujson(stuansmap.get("badlist").toString());
+                    }
+
+                    ercq.setErroroption(stuansmap.get("erroroption").toString());
                     rqueslist.add(ercq);//单个试题统计
 
                     if (tclassmap.containsKey(classid)) {
@@ -1249,7 +1288,7 @@ public class EReportGenerateService {
                             sq.setClassid(psq.getClassid());
                             sq.setStudentid(psq.getStudentid());
                             sq.setStuscore(psq.getStuscore());
-                            tstumap.put(psq.getStudentid(),sq);
+                            tstumap.put(psq.getStudentid(), sq);
                         }
                     }
                 }
@@ -1362,8 +1401,13 @@ public class EReportGenerateService {
                         //处理单选题选项情况
                         Map stuansmap = setPaperQuestionsForStuAnswer(sqcstulist);
                         ercq.setAnswerjson(stuansmap.get("answerlist").toString());
-                        ercq.setGoodstujson(stuansmap.get("goodlist").toString());
-                        ercq.setBadstujson(stuansmap.get("badlist").toString());
+                        if(N_Utils.isNotEmpty(stuansmap.get("goodlist"))){
+                            ercq.setGoodstujson(stuansmap.get("goodlist").toString());
+                        }
+                        if(N_Utils.isNotEmpty(stuansmap.get("badlist"))){
+                            ercq.setBadstujson(stuansmap.get("badlist").toString());
+                        }
+                        ercq.setErroroption(stuansmap.get("erroroption").toString());
                         rqueslist.add(ercq);//单个试题统计
                     }
                 }
@@ -1443,7 +1487,7 @@ public class EReportGenerateService {
                             sq.setClassid(psq.getClassid());
                             sq.setStudentid(psq.getStudentid());
                             sq.setStuscore(psq.getStuscore());
-                            tstumap.put(psq.getStudentid(),sq);
+                            tstumap.put(psq.getStudentid(), sq);
                         }
                     }
                 }
@@ -1504,21 +1548,21 @@ public class EReportGenerateService {
         for (int i = 0; i < quepointlist.size(); i++) {
             QuestionPointVo qpoint = quepointlist.get(i);
             List<Map> points = qpoint.getPointids();
-            if(N_Utils.isListNotEmpty(points)){
-                if(qpoint.getQlevel()==1 || !N_Utils.isEmptyInteger(qpoint.getEptqid())){
+            if (N_Utils.isListNotEmpty(points)) {
+                if (qpoint.getQlevel() == 1 || !N_Utils.isEmptyInteger(qpoint.getEptqid())) {
                     //说明本题为单题,获取该题下所有学生的得分情况
                     List<EPaperStudentQuestion> stuqueslist = paperstulist.stream().filter(s -> s.getEptqid().equals(qpoint.getEptqid())).collect(Collectors.toList());
-                    for(EPaperStudentQuestion sq : stuqueslist){
-                        setEPaperQuestionPointsForStuQues(gradestulist,sq,points,qpoint.getEptqid().toString());
+                    for (EPaperStudentQuestion sq : stuqueslist) {
+                        setEPaperQuestionPointsForStuQues(gradestulist, sq, points, qpoint.getEptqid().toString());
                     }
-                }else{
+                } else {
                     //说明该题为复合题，获取所有子题
                     List<Integer> eptqids = qpoint.getEptqids();
                     String eptqidsStr = eptqids.stream().map(String::valueOf).collect(Collectors.joining(","));
-                    List<EPaperStudentQuestion> stuqueslist = paperstulist.stream().filter(s ->eptqids.contains(s.getEptqid())).collect(Collectors.toList());
+                    List<EPaperStudentQuestion> stuqueslist = paperstulist.stream().filter(s -> eptqids.contains(s.getEptqid())).collect(Collectors.toList());
                     //根据每个学生分组获取每个学生该题分值
-                    Map<Integer,List<EPaperStudentQuestion>> stuquesmap = stuqueslist.stream().collect(Collectors.groupingBy(EPaperStudentQuestion::getStudentid));
-                    for(Map.Entry<Integer,List<EPaperStudentQuestion>> entry : stuquesmap.entrySet()){
+                    Map<Integer, List<EPaperStudentQuestion>> stuquesmap = stuqueslist.stream().collect(Collectors.groupingBy(EPaperStudentQuestion::getStudentid));
+                    for (Map.Entry<Integer, List<EPaperStudentQuestion>> entry : stuquesmap.entrySet()) {
                         List<EPaperStudentQuestion> stuques = entry.getValue();
                         Double stuscore = stuques.stream().mapToDouble(EPaperStudentQuestion::getStuscore).sum();
                         EPaperStudentQuestion sqfirst = stuques.get(0);
@@ -1526,14 +1570,14 @@ public class EReportGenerateService {
                         sq.setStudentid(entry.getKey());
                         sq.setClassid(sqfirst.getClassid());
                         sq.setStuscore(stuscore);
-                        setEPaperQuestionPointsForStuQues(gradestulist,sq,points,eptqidsStr);
+                        setEPaperQuestionPointsForStuQues(gradestulist, sq, points, eptqidsStr);
                     }
                 }
             }
         }
         List<Map> classes = examPaperClassVo.getClasses();
         //根据试卷知识点分析进行生成学生、班级、年级知识点分析
-        for(Map map : pointlist){
+        for (Map map : pointlist) {
             String pointid = map.get("pointid").toString();
             String pointname = map.get("pointname").toString();
             Double pointscore = Double.parseDouble(map.get("score").toString());
@@ -1545,8 +1589,8 @@ public class EReportGenerateService {
             List<ERPointStuScoreVo> gradepointstulist = gradestulist.stream().filter(s -> s.getPointid().equals(pointid)).collect(Collectors.toList());
 
             List<ERPointStuScoreVo> pointstuscorelist = new ArrayList<>(); //知识点下多个试题，处理成单个学生总分值情况
-            Map<Integer,List<ERPointStuScoreVo>> pointstuscoremap = gradepointstulist.stream().collect(Collectors.groupingBy(ERPointStuScoreVo::getStudentid));
-            for(Map.Entry<Integer,List<ERPointStuScoreVo>> entry : pointstuscoremap.entrySet()){
+            Map<Integer, List<ERPointStuScoreVo>> pointstuscoremap = gradepointstulist.stream().collect(Collectors.groupingBy(ERPointStuScoreVo::getStudentid));
+            for (Map.Entry<Integer, List<ERPointStuScoreVo>> entry : pointstuscoremap.entrySet()) {
                 List<ERPointStuScoreVo> stuscorelist = entry.getValue();
                 Double stuscore = stuscorelist.stream().mapToDouble(ERPointStuScoreVo::getStuscore).sum();
                 ERPointStuScoreVo sscorevofirst = stuscorelist.get(0);
@@ -1558,16 +1602,16 @@ public class EReportGenerateService {
             }
 
             Double gstuscore = pointstuscorelist.stream().mapToDouble(ERPointStuScoreVo::getStuscore).sum();
-            Double gavgscore = N_Utils.getDoubleDivideForAvg(gstuscore,pointstuscorelist.size());
-            Double gsrate = N_Utils.getDoubleDivideAndMulitiply(gstuscore,pointscore * pointstuscorelist.size());
+            Double gavgscore = N_Utils.getDoubleDivideForAvg(gstuscore, pointstuscorelist.size());
+            Double gsrate = N_Utils.getDoubleDivideAndMulitiply(gstuscore, pointscore * pointstuscorelist.size());
 
-            for(Map classm : classes){
+            for (Map classm : classes) {
                 Integer classid = Integer.parseInt(classm.get("classid").toString());
-                List<ERPointStuScoreVo> classpointstulist = pointstuscorelist.stream().filter(s->s.getClassid().equals(classid)).collect(Collectors.toList());
+                List<ERPointStuScoreVo> classpointstulist = pointstuscorelist.stream().filter(s -> s.getClassid().equals(classid)).collect(Collectors.toList());
                 Double cstuscore = classpointstulist.stream().mapToDouble(ERPointStuScoreVo::getStuscore).sum();
 //                Double cscore = classpointstulist.stream().mapToDouble(ERPointStuScoreVo::getScore).sum();
-                Double cavgscore = N_Utils.getDoubleDivideForAvg(cstuscore,classpointstulist.size());
-                Double csrate = N_Utils.getDoubleDivideAndMulitiply(cstuscore,pointscore * classpointstulist.size());
+                Double cavgscore = N_Utils.getDoubleDivideForAvg(cstuscore, classpointstulist.size());
+                Double csrate = N_Utils.getDoubleDivideAndMulitiply(cstuscore, pointscore * classpointstulist.size());
 
                 ERclassPoint eRclassPoint = new ERclassPoint();
                 eRclassPoint.setExamid(examPaperClassVo.getExamid());
@@ -1588,7 +1632,7 @@ public class EReportGenerateService {
                 cpointlist.add(eRclassPoint);
 
                 //遍历单个学生
-                for(ERPointStuScoreVo stu : classpointstulist){
+                for (ERPointStuScoreVo stu : classpointstulist) {
                     ERstudentPoint erstupoint = new ERstudentPoint();
                     erstupoint.setExamid(examPaperClassVo.getExamid());
                     erstupoint.setSubjectid(examPaperClassVo.getSubjectid());
@@ -1598,7 +1642,7 @@ public class EReportGenerateService {
                     erstupoint.setPointid(pointid);
                     erstupoint.setPointname(pointname);
                     erstupoint.setStuscore(stu.getStuscore());
-                    erstupoint.setStusrate(N_Utils.getDoubleDivideAndMulitiply(stu.getStuscore(),pointscore));
+                    erstupoint.setStusrate(N_Utils.getDoubleDivideAndMulitiply(stu.getStuscore(), pointscore));
                     stupointlist.add(erstupoint);
                 }
             }
@@ -1607,9 +1651,10 @@ public class EReportGenerateService {
 
 
     }
+
     //题型、试题、知识点、难易度--知识点:设置每个学生每个试题知识点得分
-    private void setEPaperQuestionPointsForStuQues(List<ERPointStuScoreVo> gradestulist,EPaperStudentQuestion sq,List<Map> points,String eptqids){
-        if(points.size() == 1){
+    private void setEPaperQuestionPointsForStuQues(List<ERPointStuScoreVo> gradestulist, EPaperStudentQuestion sq, List<Map> points, String eptqids) {
+        if (points.size() == 1) {
             Map pointmap = points.get(0);
             //说明该试题仅有一个知识点得分直接为改知识点分值
             ERPointStuScoreVo pscvo = new ERPointStuScoreVo();
@@ -1620,10 +1665,10 @@ public class EReportGenerateService {
             pscvo.setPointid(pointid);
             pscvo.setEptqids(eptqids);
             gradestulist.add(pscvo);
-        }else{
+        } else {
             //计算每个知识点所占分值（平均分配）
-            Double[] avgps = ExamUtil.getPointAvgScore(points.size(),sq.getStuscore());
-            for(int j=0;j<points.size();j++){
+            Double[] avgps = ExamUtil.getPointAvgScore(points.size(), sq.getStuscore());
+            for (int j = 0; j < points.size(); j++) {
                 Map pointmap = points.get(j);
                 ERPointStuScoreVo pscvo = new ERPointStuScoreVo();
                 pscvo.setClassid(sq.getClassid());
@@ -1631,9 +1676,9 @@ public class EReportGenerateService {
                 String pointid = pointmap.get("pointid").toString();
                 pscvo.setPointid(pointid);
                 pscvo.setEptqids(eptqids);
-                if(avgps.length == 2 && (j+1) == points.size()){
+                if (avgps.length == 2 && (j + 1) == points.size()) {
                     pscvo.setStuscore(avgps[1]);
-                }else{
+                } else {
                     pscvo.setStuscore(avgps[0]);
                 }
 
@@ -1662,9 +1707,9 @@ public class EReportGenerateService {
             }
 
             List<EPaperStudentQuestion> levelstuquelist = new ArrayList<>();//难易度下所有试题
-            for(Integer eptqid : leveleptqids){
-               List<EPaperStudentQuestion> petqqueslit = paperstulist.stream().filter(s -> eptqid.equals(s.getEptqid())).collect(Collectors.toList());
-               levelstuquelist.addAll(petqqueslit);
+            for (Integer eptqid : leveleptqids) {
+                List<EPaperStudentQuestion> petqqueslit = paperstulist.stream().filter(s -> eptqid.equals(s.getEptqid())).collect(Collectors.toList());
+                levelstuquelist.addAll(petqqueslit);
             }
 
             List<EPaperStudentQuestion> qgstulist = new ArrayList<>();//每个学生难易度下得分
@@ -1693,8 +1738,8 @@ public class EReportGenerateService {
                 stucomplist.add(stucomp);
             }
 
-            Double tgstuscore = qgstulist.stream().mapToDouble(EPaperStudentQuestion :: getStuscore).sum();//难易度下学生得分
-            Double tgscore = qgstulist.stream().mapToDouble(EPaperStudentQuestion :: getQscore).sum();//难易度下试题总分
+            Double tgstuscore = qgstulist.stream().mapToDouble(EPaperStudentQuestion::getStuscore).sum();//难易度下学生得分
+            Double tgscore = qgstulist.stream().mapToDouble(EPaperStudentQuestion::getQscore).sum();//难易度下试题总分
             Double tgsrate = N_Utils.getDoubleDivideAndMulitiply(tgstuscore, tgscore);//年级得分率
 
             for (Map classm : classes) {

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

@@ -160,8 +160,8 @@ public class EReportStudentService {
             Double qscore = Double.parseDouble(m.get("qscore").toString());
             Double stusrate = N_Utils.getDoubleDivideAndMulitiply(stuscore, qscore);
             m.put("stusrate", stusrate);
-            Double srate = N_Utils.getDoubleDivideAndMulitiply(qscore,paperscore);
-            m.put("srate",srate);
+            Double srate = N_Utils.getDoubleDivideAndMulitiply(qscore, paperscore);
+            m.put("srate", srate);
         }
         return list;
     }
@@ -183,10 +183,10 @@ public class EReportStudentService {
             setPaperQuestionForTK(list);
         } else {
             list = eRstudentMapper.listStudentQuestionsFj(epid, studentid);
-            for(Map qmap : list){
+            for (Map qmap : list) {
                 Double stuscore = Double.parseDouble(qmap.get("stuscore").toString());
-                Double pscore = Double .parseDouble(qmap.get("qscore").toString());
-                qmap.put("srate",N_Utils.getDoubleDivideAndMulitiply(stuscore,pscore));
+                Double pscore = Double.parseDouble(qmap.get("qscore").toString());
+                qmap.put("srate", N_Utils.getDoubleDivideAndMulitiply(stuscore, pscore));
             }
             List<Map> files = ePaperFileMapper.listPaperFiles(epid);
             map.put("files", files);
@@ -209,8 +209,8 @@ public class EReportStudentService {
                 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("qscore").toString());
-                Double pscore = Double .parseDouble(map.get("qscore").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()));
@@ -219,27 +219,27 @@ public class EReportStudentService {
                 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"))){
+                if (N_Utils.isNotEmpty(q.get("qoption"))) {
                     map.put("qoption", q.get("qoption").toString());
-                }else{
+                } else {
                     map.put("qoption", "");
                 }
-                if(N_Utils.isNotEmpty(q.get("qanalyze"))){
+                if (N_Utils.isNotEmpty(q.get("qanalyze"))) {
                     map.put("qanalyze", q.get("qanalyze").toString());
-                }else{
+                } else {
                     map.put("qanalyze", "");
                 }
 
                 Integer hashear = Integer.parseInt(q.get("hashear").toString());
                 map.put("hashear", hashear);
-                if(hashear == 1){
+                if (hashear == 1) {
                     map.put("hearfile", q.get("hearfile").toString());
                 }
 
                 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));//得分率
+                map.put("srate", N_Utils.getDoubleDivideAndMulitiply(stuscore, pscore));//得分率
 
                 if (q.get("points") != null) {
                     List<Map> points = (List<Map>) q.get("points");
@@ -252,32 +252,33 @@ public class EReportStudentService {
                 if (!questiopids.contains(questionpid)) {
                     questiopids.add(questionpid);
                     //获取所有试题
-                    List<Map> sonqueslist = list.stream().filter(s -> s.get("questionpid").toString().equals(questionpid)).collect(Collectors.toList());
+                    List<Map> sonqueslist =
+                            list.stream().filter(s -> Integer.parseInt(s.get("qlevel").toString()) == 3 && questionpid.equals(s.get("questionpid").toString())).collect(Collectors.toList());
                     Map mq = new HashMap();
                     mq.put("questionid", questionpid);
                     mq.put("qlevel", 2);
                     mq.put("qorder", Integer.parseInt(q.get("qorder").toString()));
                     mq.put("ctype", Integer.parseInt(q.get("mctype").toString()));
                     mq.put("qstem", q.get("mqstem").toString());
-                    if(N_Utils.isNotEmpty(q.get("mqoption"))){
+                    if (N_Utils.isNotEmpty(q.get("mqoption"))) {
                         mq.put("qoption", q.get("mqoption").toString());
-                    }else{
+                    } else {
                         mq.put("qoption", "");
                     }
-                    if(N_Utils.isNotEmpty(q.get("mqanalyze"))){
+                    if (N_Utils.isNotEmpty(q.get("mqanalyze"))) {
                         mq.put("qanalyze", q.get("mqanalyze").toString());
-                    }else{
+                    } else {
                         mq.put("qanalyze", "");
                     }
-                    if(N_Utils.isNotEmpty(q.get("mqanswer"))){
+                    if (N_Utils.isNotEmpty(q.get("mqanswer"))) {
                         mq.put("qanalyze", q.get("mqanswer").toString());
-                    }else{
+                    } else {
                         mq.put("qanalyze", "");
                     }
 
                     Integer hashear = Integer.parseInt(q.get("mhashear").toString());
                     mq.put("hashear", hashear);
-                    if(hashear == 1){
+                    if (hashear == 1) {
                         mq.put("hearfile", q.get("mhearfile").toString());
                     }
                     if (q.get("points") != null) {
@@ -286,9 +287,8 @@ 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("pscore").toString())).sum();
-                    mq.put("srate",N_Utils.getDoubleDivideAndMulitiply(stuscore,pscore));
-
+                    Double pscore = sonqueslist.stream().mapToDouble(s -> Double.parseDouble(s.get("qscore").toString())).sum();
+                    mq.put("srate", N_Utils.getDoubleDivideAndMulitiply(stuscore, pscore));
                     mq.put("sonques", sonqueslist);
                     rtnlist.add(mq);
                 }
@@ -309,22 +309,22 @@ public class EReportStudentService {
         for (Map map : list) {
             List<Map> queslist = (List<Map>) map.get("questions");
             Integer ptype = Integer.parseInt(map.get("ptype").toString());
-            if(ptype==1){
+            if (ptype == 1) {
                 //单题的数量
                 List<Map> dtlist = queslist.stream().filter(s -> Integer.parseInt(s.get("qlevel").toString()) == 1).collect(Collectors.toList());
                 //子题
                 List<Map> sonlist = queslist.stream().filter(s -> Integer.parseInt(s.get("qlevel").toString()) == 3).collect(Collectors.toList());
-                Map<String,List<Map>> mtmap = sonlist.stream().collect(Collectors.groupingBy(s -> s.get("questionpid").toString()));
+                Map<String, List<Map>> mtmap = sonlist.stream().collect(Collectors.groupingBy(s -> s.get("questionpid").toString()));
                 int num = 0;
-                if(N_Utils.isListNotEmpty(dtlist)){
+                if (N_Utils.isListNotEmpty(dtlist)) {
                     num = dtlist.size();
                 }
-                if(mtmap!=null && mtmap.size()>0){
+                if (mtmap != null && mtmap.size() > 0) {
                     num = num + mtmap.size();
                 }
-                map.put("num",num);
-            }else{
-                map.put("num",queslist.size());
+                map.put("num", num);
+            } else {
+                map.put("num", queslist.size());
             }
             map.remove("questions");
         }
@@ -338,33 +338,33 @@ public class EReportStudentService {
      * @Author wn
      * @Date 2022/8/29 16:15
      **/
-    public Map listStudentErrorQuestionsTk(Integer examid, Integer studentid,String subjectid){
-        List<Map> list = eRstudentMapper.listStudentErrorQuestionsForTk(examid,studentid,subjectid);
-        Map panalyze = ePaperAnalyzeMapper.getPaperAnalzyeBySubjectid(examid,subjectid);
+    public Map listStudentErrorQuestionsTk(Integer examid, Integer studentid, String subjectid) {
+        List<Map> list = eRstudentMapper.listStudentErrorQuestionsForTk(examid, studentid, subjectid);
+        Map panalyze = ePaperAnalyzeMapper.getPaperAnalzyeBySubjectid(examid, subjectid);
         String pointjson = panalyze.get("pointjson").toString();
         List<Map> pointlist = JSON.parseArray(pointjson, Map.class);
         List<Map> pointqueslist = new ArrayList<>();
-        for(Map pointmap : pointlist){
+        for (Map pointmap : pointlist) {
             //知识点包含的试题
             List<Map> ques = (List<Map>) pointmap.get("ques");
             List<Integer> eptqidlist = new ArrayList<>();//知识点关联的所有试题
-            for(Map qovo : ques){
+            for (Map qovo : ques) {
                 List<Integer> eptqids = (List<Integer>) qovo.get("eptqids");
                 eptqidlist.addAll(eptqids);
             }
             //获取知识点下试题
             List<Map> poinques = list.stream().filter(s -> eptqidlist.contains(Integer.parseInt(s.get("eptqid").toString()))).collect(Collectors.toList());
-            if(N_Utils.isListNotEmpty(poinques)){
+            if (N_Utils.isListNotEmpty(poinques)) {
                 Map pmap = new HashMap();
-                pmap.put("pointid",pointmap.get("pointid").toString());
-                pmap.put("pointname",pointmap.get("pointname").toString());
-                pmap.put("questions",setPaperQuestionForTK(poinques));
+                pmap.put("pointid", pointmap.get("pointid").toString());
+                pmap.put("pointname", pointmap.get("pointname").toString());
+                pmap.put("questions", setPaperQuestionForTK(poinques));
                 pointqueslist.add(pmap);
             }
         }
         Map map = new HashMap();
-        map.put("questions",setPaperQuestionForTK(list));
-        map.put("points",pointqueslist);
+        map.put("questions", setPaperQuestionForTK(list));
+        map.put("points", pointqueslist);
         return map;
     }
 
@@ -375,13 +375,13 @@ public class EReportStudentService {
      * @Author wn
      * @Date 2022/8/29 16:15
      **/
-    public List<Map> listStudentErrorQuestionsFj(Integer examid, Integer studentid,String subjectid){
-        List<Map> list = eRstudentMapper.listStudentErrorQuestionsForFj(examid,studentid,subjectid);
-        for(Map map : list){
+    public List<Map> listStudentErrorQuestionsFj(Integer examid, Integer studentid, String subjectid) {
+        List<Map> list = eRstudentMapper.listStudentErrorQuestionsForFj(examid, studentid, subjectid);
+        for (Map map : list) {
             Double stuscore = Double.parseDouble(map.get("stuscore").toString());
-            Double pscore = Double .parseDouble(map.get("qscore").toString());
-            Double srate = N_Utils.getDoubleDivideAndMulitiply(stuscore,pscore);
-            map.put("srate",srate);
+            Double pscore = Double.parseDouble(map.get("qscore").toString());
+            Double srate = N_Utils.getDoubleDivideAndMulitiply(stuscore, pscore);
+            map.put("srate", srate);
         }
         return list;
     }

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

@@ -132,8 +132,10 @@
 
     <!--报告生成-学生试卷-->
     <select id="listExamStudentsAnswer" resultType="com.xhkjedu.sexam.model.paperstudent.EPaperStudentQuestion">
-        select q.epsqid,q.classid,q.studentid,q.epid,q.eptqid,q.ctype,q.qn,q.answertype,q.stuanswer,q.qscore,q.stuscore,q.good,q.bad,u.username stuname
+        select q.epsqid,q.classid,q.studentid,q.epid,q.eptqid,q.ctype,q.qn,q.answertype,q.stuanswer,q.qscore,
+        q.stuscore,q.good,q.bad,u.username stuname,pq.answer
         from e_paper_student_question q left join e_paper_student s on s.epsid=q.epsid
+        left join e_paper_qtype_question pq on q.eptqid=pq.eptqid
         left join t_user u on q.studentid=u.userid where s.examid=#{examid} and s.sstate=2 group by q.epsqid
     </select>
 

sexam/src/test/java/com/xhkjedu/sexam/SexamApplicationTests.java

@@ -1,13 +1,22 @@
 package com.xhkjedu.sexam;
 
+import com.xhkjedu.sexam.model.paper.EPaper;
+import com.xhkjedu.sexam.service.paper.EPaperQtypeService;
+import com.xhkjedu.sexam.service.report.EReportGenerateService;
 import org.junit.jupiter.api.Test;
 import org.springframework.boot.test.context.SpringBootTest;
+
+import javax.annotation.Resource;
+
 @SpringBootTest
 class SexamApplicationTests {
 
+    @Resource
+    private EReportGenerateService eReportGenerateService;
+
     @Test
     void contextLoads() {
-
+//        eReportGenerateService.saveClassQuestions(2);
     }
 
 }