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

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

@@ -1040,12 +1040,12 @@ public class EReportGenerateService {
 
             if (ptype == 1) {
                 //处理题型下试题：题库显示题号时为母题的题号即order（qn是英语为顺延题号其他学科为母题号和子题排序拼接）
-                String qtypejson = panalyze.get("qnumjson").toString();//原试卷题型分析
-                List<Map> qtypelist = JSON.parseArray(qtypejson, Map.class);
-                setPaperQuestionTkQtypes(qtypelist, paperstulist, rtypelist, rqueslist, stutypelist, examPaperClassVo);
+//                String qtypejson = panalyze.get("qnumjson").toString();//原试卷题型分析
+//                List<Map> qtypelist = JSON.parseArray(qtypejson, Map.class);
+//                setPaperQuestionTkQtypes(qtypelist, paperstulist, rtypelist, rqueslist, stutypelist, examPaperClassVo);
 
                 //处理知识点
-                setEPaperQuestionPoints(panalyze, paperstulist, rpointlist, stupointlist, examPaperClassVo);
+//                setEPaperQuestionPoints(panalyze, paperstulist, rpointlist, stupointlist, examPaperClassVo);
 
                 //处理难易度
                 String complexityjson = panalyze.get("complexityjson").toString();
@@ -1059,13 +1059,13 @@ public class EReportGenerateService {
                 setPaperQuestionFjQtypes(qtypelist, paperstulist, rtypelist, rqueslist, stutypelist, examPaperClassVo);
             }
         }
-        eRclassQtypeMapper.insertList(rtypelist);
-        eRstudentQtypeMapper.insertList(stutypelist);
-        eRclassQuestionMapper.insertList(rqueslist);
+//        eRclassQtypeMapper.insertList(rtypelist);
+//        eRstudentQtypeMapper.insertList(stutypelist);
+//        eRclassQuestionMapper.insertList(rqueslist);
         eRclassComplexityMapper.insertList(complist);
         erStudentComplexityMapper.insertList(stucomplist);
-        eRclassPointMapper.insertList(rpointlist);
-        eRstudentPointMapper.insertList(stupointlist);
+//        eRclassPointMapper.insertList(rpointlist);
+//        eRstudentPointMapper.insertList(stupointlist);
     }
 
     //题型、试题、知识点、难易度--处理学生选项情况和得分情况
@@ -1499,14 +1499,15 @@ public class EReportGenerateService {
             List<Map> points = qpoint.getPointids();
             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);
+                        setEPaperQuestionPointsForStuQues(gradestulist,sq,points,qpoint.getEptqid().toString());
                     }
                 }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());
                     //根据每个学生分组获取每个学生该题分值
                     Map<Integer,List<EPaperStudentQuestion>> stuquesmap = stuqueslist.stream().collect(Collectors.groupingBy(EPaperStudentQuestion::getStudentid));
@@ -1515,7 +1516,7 @@ public class EReportGenerateService {
                         Double stuscore = stuques.stream().mapToDouble(EPaperStudentQuestion::getStuscore).sum();
                         EPaperStudentQuestion sq = stuques.get(0);
                         sq.setStuscore(stuscore);
-                        setEPaperQuestionPointsForStuQues(gradestulist,sq,points);
+                        setEPaperQuestionPointsForStuQues(gradestulist,sq,points,eptqidsStr);
                     }
                 }
             }
@@ -1596,7 +1597,7 @@ public class EReportGenerateService {
 
     }
     //题型、试题、知识点、难易度--知识点:设置每个学生每个试题知识点得分
-    private void setEPaperQuestionPointsForStuQues(List<ERPointStuScoreVo> gradestulist,EPaperStudentQuestion sq,List<Map> points){
+    private void setEPaperQuestionPointsForStuQues(List<ERPointStuScoreVo> gradestulist,EPaperStudentQuestion sq,List<Map> points,String eptqids){
         if(points.size() == 1){
             Map pointmap = points.get(0);
             //说明该试题仅有一个知识点得分直接为改知识点分值
@@ -1606,6 +1607,7 @@ public class EReportGenerateService {
             pscvo.setStuscore(sq.getStuscore());
             String pointid = pointmap.get("pointid").toString();
             pscvo.setPointid(pointid);
+            pscvo.setEptqids(eptqids);
             gradestulist.add(pscvo);
         }else{
             //计算每个知识点所占分值（平均分配）
@@ -1617,6 +1619,7 @@ public class EReportGenerateService {
                 pscvo.setStudentid(sq.getStudentid());
                 String pointid = pointmap.get("pointid").toString();
                 pscvo.setPointid(pointid);
+                pscvo.setEptqids(eptqids);
                 if(avgps.length == 2 && (j+1) == points.size()){
                     pscvo.setStuscore(avgps[1]);
                 }else{
@@ -1658,8 +1661,9 @@ public class EReportGenerateService {
                 } else {
                     //该题未复合型试题
                     qgstulist = new ArrayList<>();
+                    List<EPaperStudentQuestion> stuquelist = paperstulist.stream().filter(s -> eptqids.contains(s.getEptqid())).collect(Collectors.toList());
                     //母子题情况，计算所有子题的和即为母题。把试题按照学生分组，分组为一组的即为
-                    Map<Integer, List<EPaperStudentQuestion>> stuQuesMap = paperstulist.stream().collect(Collectors.groupingBy(EPaperStudentQuestion::getStudentid));
+                    Map<Integer, List<EPaperStudentQuestion>> stuQuesMap = stuquelist.stream().collect(Collectors.groupingBy(EPaperStudentQuestion::getStudentid));
                     for (Map.Entry<Integer, List<EPaperStudentQuestion>> entry : stuQuesMap.entrySet()) {
                         List<EPaperStudentQuestion> stuqueslist = entry.getValue();
                         EPaperStudentQuestion pstq = stuqueslist.get(0);

sexam/src/main/java/com/xhkjedu/sexam/vo/report/ERPointStuScoreVo.java

@@ -19,4 +19,6 @@ public class ERPointStuScoreVo {
     private Double score;//试题分值
 
     private Double stuscore;//学生得分
+
+    private String eptqids;//试题id
 }