题库知识点

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

@@ -790,7 +790,7 @@ public class EReportGenerateQuestionService {
             // 单个知识点学生得分情况:一个知识对应一个或多个试题，
             List<ERPointStuScoreVo> gradepointstulist = gradestulist.stream().filter(s -> s.getPointid().equals(pointid)).collect(Collectors.toList());
 
-            List<ERPointStuScoreVo> pointstuscorelist = new ArrayList<>(); // 知识点下多个试题，处理成单个学生总分值情况
+            List<ERPointStuScoreVo> pointstuscorelistZero = new ArrayList<>(); // 知识点下多个试题，处理成单个学生总分值情况
             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();
@@ -798,59 +798,78 @@ public class EReportGenerateQuestionService {
                 stuscore = N_Utils.formatDouble(stuscore, 1);
                 ERPointStuScoreVo sscorevofirst = stuscorelist.get(0);
                 ERPointStuScoreVo sscorevo = new ERPointStuScoreVo();
+                sscorevo.setStupaperscore(sscorevofirst.getStupaperscore());
                 sscorevo.setStudentid(sscorevofirst.getStudentid());
                 sscorevo.setClassid(sscorevofirst.getClassid());
                 sscorevo.setStuscore(stuscore);
-                pointstuscorelist.add(sscorevo);
+                pointstuscorelistZero.add(sscorevo);
+            }
+
+            List<ERPointStuScoreVo> pointstuscorelist = new ArrayList<>();
+            if(stuzero == 0){
+                //如果为0：0分学生不参与统计
+                pointstuscorelist = pointstuscorelistZero.stream().filter(s -> s.getStupaperscore() > 0).collect(Collectors.toList());
+            }else {
+                pointstuscorelist.addAll(pointstuscorelistZero);
+            }
+
+            Double gstuscore = 0D;
+            Double gavgscore = 0D;
+            Double gsrate = 0D;
+            if(pointstuscorelist.size() > 0){
+                gstuscore = pointstuscorelist.stream().mapToDouble(ERPointStuScoreVo::getStuscore).sum();
+                gstuscore = N_Utils.formatDouble(gstuscore, 1);
+                gavgscore = N_Utils.getDoubleDivideForAvg(gstuscore, pointstuscorelist.size());
+                gsrate = N_Utils.getDoubleDivideAndMulitiply(gstuscore, pointscore * pointstuscorelist.size());
             }
 
-            Double gstuscore = pointstuscorelist.stream().mapToDouble(ERPointStuScoreVo::getStuscore).sum();
-            gstuscore = N_Utils.formatDouble(gstuscore, 1);
-            Double gavgscore = N_Utils.getDoubleDivideForAvg(gstuscore, pointstuscorelist.size());
-            Double gsrate = N_Utils.getDoubleDivideAndMulitiply(gstuscore, pointscore * pointstuscorelist.size());
 
             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());
-                if (N_Utils.isListNotEmpty(classpointstulist)) {
-                    Double cstuscore = classpointstulist.stream().mapToDouble(ERPointStuScoreVo::getStuscore).sum();
+                List<ERPointStuScoreVo> classpointstulistZero = pointstuscorelistZero.stream().filter(s -> s.getClassid().equals(classid)).collect(Collectors.toList());
+
+                Double cstuscore = 0D;
+                Double cavgscore = 0D;
+                Double csrate = 0D;
+                if (N_Utils.isListNotEmpty(classpointstulist) && classpointstulist.size() > 0) {
+                    cstuscore = classpointstulist.stream().mapToDouble(ERPointStuScoreVo::getStuscore).sum();
                     cstuscore = N_Utils.formatDouble(cstuscore, 1);
-//                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());
-
-                    ERclassPoint eRclassPoint = new ERclassPoint();
-                    eRclassPoint.setExamid(examPaperClassVo.getExamid());
-                    eRclassPoint.setClassid(classid);
-                    eRclassPoint.setEpid(examPaperClassVo.getEpid());
-                    eRclassPoint.setSubjectid(examPaperClassVo.getSubjectid());
-                    eRclassPoint.setPointid(pointid);
-                    eRclassPoint.setPointname(pointname);
-                    eRclassPoint.setScore(pointscore);
-                    eRclassPoint.setSrate(pointrate);
-                    eRclassPoint.setGradescore(gstuscore);
-                    eRclassPoint.setGradeavgscore(gavgscore);
-                    eRclassPoint.setGradesrate(gsrate);
-                    eRclassPoint.setClassscore(cstuscore);
-                    eRclassPoint.setClassavgscore(cavgscore);
-                    eRclassPoint.setClasssrate(csrate);
-                    eRclassPoint.setQns(orderstr);
-                    cpointlist.add(eRclassPoint);
-
-                    // 遍历单个学生
-                    for (ERPointStuScoreVo stu : classpointstulist) {
-                        ERstudentPoint erstupoint = new ERstudentPoint();
-                        erstupoint.setExamid(examPaperClassVo.getExamid());
-                        erstupoint.setSubjectid(examPaperClassVo.getSubjectid());
-                        erstupoint.setEpid(examPaperClassVo.getEpid());
-                        erstupoint.setStudentid(stu.getStudentid());
-                        erstupoint.setClassid(classid);
-                        erstupoint.setPointid(pointid);
-                        erstupoint.setPointname(pointname);
-                        erstupoint.setStuscore(stu.getStuscore());
-                        erstupoint.setStusrate(N_Utils.getDoubleDivideAndMulitiply(stu.getStuscore(), pointscore));
-                        stupointlist.add(erstupoint);
-                    }
+                    cavgscore = N_Utils.getDoubleDivideForAvg(cstuscore, classpointstulist.size());
+                    csrate = N_Utils.getDoubleDivideAndMulitiply(cstuscore, pointscore * classpointstulist.size());
+                }
+
+                ERclassPoint eRclassPoint = new ERclassPoint();
+                eRclassPoint.setExamid(examPaperClassVo.getExamid());
+                eRclassPoint.setClassid(classid);
+                eRclassPoint.setEpid(examPaperClassVo.getEpid());
+                eRclassPoint.setSubjectid(examPaperClassVo.getSubjectid());
+                eRclassPoint.setPointid(pointid);
+                eRclassPoint.setPointname(pointname);
+                eRclassPoint.setScore(pointscore);
+                eRclassPoint.setSrate(pointrate);
+                eRclassPoint.setGradescore(gstuscore);
+                eRclassPoint.setGradeavgscore(gavgscore);
+                eRclassPoint.setGradesrate(gsrate);
+                eRclassPoint.setClassscore(cstuscore);
+                eRclassPoint.setClassavgscore(cavgscore);
+                eRclassPoint.setClasssrate(csrate);
+                eRclassPoint.setQns(orderstr);
+                cpointlist.add(eRclassPoint);
+
+                // 遍历单个学生
+                for (ERPointStuScoreVo stu : classpointstulistZero) {
+                    ERstudentPoint erstupoint = new ERstudentPoint();
+                    erstupoint.setExamid(examPaperClassVo.getExamid());
+                    erstupoint.setSubjectid(examPaperClassVo.getSubjectid());
+                    erstupoint.setEpid(examPaperClassVo.getEpid());
+                    erstupoint.setStudentid(stu.getStudentid());
+                    erstupoint.setClassid(classid);
+                    erstupoint.setPointid(pointid);
+                    erstupoint.setPointname(pointname);
+                    erstupoint.setStuscore(stu.getStuscore());
+                    erstupoint.setStusrate(N_Utils.getDoubleDivideAndMulitiply(stu.getStuscore(), pointscore));
+                    stupointlist.add(erstupoint);
                 }
             }
         }
@@ -922,7 +941,6 @@ public class EReportGenerateQuestionService {
             Map<Integer, List<EPaperStudentQuestion>> stuQuesMap = levelstuquelist.stream().collect(Collectors.groupingBy(EPaperStudentQuestion::getStudentid));
             for (Map.Entry<Integer, List<EPaperStudentQuestion>> entry : stuQuesMap.entrySet()) {
                 List<EPaperStudentQuestion> stuqueslist = entry.getValue();
-                log.error("key:" + entry.getKey());
                 EPaperStudentQuestion pfirst = stuqueslist.get(0);
                 EPaperStudentQuestion pstq = new EPaperStudentQuestion();
                 pstq.setStupaperscore(pfirst.getStupaperscore());

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

@@ -296,7 +296,7 @@ public class EReportGenerateService {
 
         setAction(examid, userMap);//行为分析
         eBaseMapper.updateExamState(examid,3);
-        // htmlToPdf(examid, classes, schoolStudents, userMap2);//考试报告html转pdf
+        htmlToPdf(examid, classes, schoolStudents, userMap2);//考试报告html转pdf
     }
 
     /**

sexam/src/main/resources/application.properties

@@ -104,5 +104,5 @@ ipregiondb=D:\\school\\ip2region.xdb
 
 #版本号
 buildnum=300
-versionname=Test_v3.13.3
+versionname=Test_v3.13.4