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

# Conflicts:
#	sexam/src/main/java/com/xhkjedu/sexam/service/report/EReportGenerateService.java

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

@@ -32,7 +32,6 @@ import com.xhkjedu.sexam.vo.report.ERPaperVo;
 import com.xhkjedu.utils.N_Utils;
 import com.xhkjedu.vo.system.UserVo;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.scheduling.annotation.AsyncResult;
 import org.springframework.stereotype.Service;
@@ -80,7 +79,7 @@ public class EReportGenerateService {
     private ERclassActionMapper eRclassActionMapper;
     @Resource
     private ERstudentActionMapper eRstudentActionMapper;
-    @Autowired
+    @Resource
     private ConvertUtil convertUtil;
     @Resource
     private EReportGenerateQuestionService eReportGenerateQuestionService;
@@ -132,14 +131,8 @@ public class EReportGenerateService {
         Map<String, Integer> classStuRank = new HashMap<>();//班级学生分数排名
         Map<String, Integer> classSubStuRank = new HashMap<>();//班级科目学生分数排名
         Integer stuzero = base.getStuzero();
-        List<ERstudent> allStudents = ePaperStudentMapper.listByExamId(examid, epids);
-        List<ERstudent> students;
-        int sknum = allStudents.stream().filter(l -> l.getSstate() == 2).map(l -> l.getStudentid()).distinct().collect(Collectors.toList()).size();
-        if (stuzero.equals(0)) {//0分学生不参与统计
-            students = allStudents.stream().filter(s -> s.getScore() > 0).collect(Collectors.toList());
-        } else {
-            students = allStudents;
-        }
+        List<ERstudent> students = ePaperStudentMapper.listByExamId(examid, epids);
+        int sknum = students.stream().filter(l -> l.getSstate() == 2).map(l -> l.getStudentid()).distinct().collect(Collectors.toList()).size();
         Map<Integer, List<ERstudent>> schoolCollect = students.stream().collect(Collectors.groupingBy(s -> s.getStudentid()));
         for (Map.Entry<Integer, List<ERstudent>> entry : schoolCollect.entrySet()) {
             Integer studentid = entry.getKey();
@@ -187,11 +180,17 @@ public class EReportGenerateService {
             }
         }
 
-        DoubleSummaryStatistics schoolStatistics = schoolStudents.stream().mapToDouble(s -> s.getScore()).summaryStatistics();
+        List<ERstudent> schoolStudents2;//参与统计学生列表
+        if (stuzero.equals(0)) {//0分学生不参与统计
+            schoolStudents2 = schoolStudents.stream().filter(s -> s.getScore() > 0).collect(Collectors.toList());
+        } else {
+            schoolStudents2 = schoolStudents;
+        }
+        DoubleSummaryStatistics schoolStatistics = schoolStudents2.stream().filter(s -> s.getScore() > 0).mapToDouble(s -> s.getScore()).summaryStatistics();
         double schoolStatisticsMax = schoolStatistics.getMax();
         double schoolStatisticsAverage = N_Utils.formatDouble(schoolStatistics.getAverage(), 2);
         //最低分均不包括0分
-        double schoolStatisticsMin = schoolStudents.stream().filter(s -> s.getScore() > 0).mapToDouble(s -> s.getScore()).min().getAsDouble();
+        double schoolStatisticsMin = schoolStudents.stream().filter(s -> s.getScore() > 0).mapToDouble(s -> s.getScore()).summaryStatistics().getMin();
         if (N_Utils.isListEmpty(students)) {
             schoolStatisticsMax = 0;
             schoolStatisticsMin = 0;
@@ -213,7 +212,7 @@ public class EReportGenerateService {
         List<ERsubject> subjectList = new ArrayList<>();//考试报告科目情况
         List<ERclass> classList = new ArrayList<>();//考试报告班级情况
         setSubject(examid, stunum, "zf", "总分", subjectList, classList, schoolStudents
-                , papers.stream().mapToDouble(p -> p.getPscore()).sum());
+                , papers.stream().mapToDouble(p -> p.getPscore()).sum(), stuzero);
         for (Map.Entry<String, List<ERstudent>> ssEntry : subCollect.entrySet()) {
             subjectid = ssEntry.getKey();
             subjectname = subjectMap.get(subjectid);
@@ -234,7 +233,7 @@ public class EReportGenerateService {
             schoolSubjectStudents.addAll(rstudents);
             ERPaperVo rp = paperMap.get(subjectid);
             Double allscore = rp.getPscore();//满分
-            setSubject(examid, stunum, subjectid, subjectname, subjectList, classList, list, allscore);
+            setSubject(examid, stunum, subjectid, subjectname, subjectList, classList, list, allscore, stuzero);
         }
 
         setClassAvgRank(classList);//班级科目平均分排名
@@ -289,17 +288,15 @@ public class EReportGenerateService {
             userMap = users.stream().collect(Collectors.toMap(UserVo::getUserid, UserVo::getUsername));
             userMap2 = users.stream().collect(Collectors.toMap(UserVo::getUserid, u -> u.getLoginname() + "_" + u.getUsername()));
         }
-        List<ERstudent> classSubjectStudents2 = new ArrayList<>();
+        List<ERstudent> classSubjectStudents2;//参与统计学生列表
         if (stuzero.equals(0)) {//0分学生不参与统计
-            Map<String, List<ERstudent>> collect = allStudents.stream().collect(Collectors.groupingBy(s -> s.getSubjectid() + "_" + s.getClassid()));
-            for (Map.Entry<String, List<ERstudent>> ssEntry : collect.entrySet()) {
-                classSubjectStudents2.addAll(ssEntry.getValue());
-            }
+            classSubjectStudents2 = classSubjectStudents.stream().filter(s -> s.getScore() > 0).collect(Collectors.toList());
         } else {
             classSubjectStudents2 = classSubjectStudents;
         }
-        // setClassGradeRankAll(examid, stunum, papers, classSubjectStudents2, createid, userMap);//班级等级分布
-        setClassGradeRank(examid, stunum, papers, classSubjectStudents, setRrank(5), createid, userMap);//班级等级分布--优困生
+        setClassGradeRankAll(examid, stunum, papers, classSubjectStudents, createid, userMap);//班级等级分布
+        setClassGradeRank(examid, stunum, papers, classSubjectStudents2, setRrank(5), createid, userMap);//班级等级分布--优困生
+
         setAction(examid, userMap);//行为分析
         eBaseMapper.updateExamState(examid,3);
         htmlToPdf(examid, classes, schoolStudents, userMap2);//考试报告html转pdf
@@ -393,16 +390,22 @@ public class EReportGenerateService {
 
     //科目统计
     private void setSubject(Integer examid, Integer fbstunum, String subjectid, String subjectname, List<ERsubject> subjectList,
-                            List<ERclass> classList, List<ERstudent> list, Double allscore) {
+                            List<ERclass> classList, List<ERstudent> list, Double allscore, Integer stuzero) {
         double yxscore = ExamUtil.mul(allscore, 0.85);//优秀分
         double lhscore = ExamUtil.mul(allscore, 0.7);//良好分
         double jgscore = ExamUtil.mul(allscore, 0.6);//及格分
         double dfscore = ExamUtil.mul(allscore, 0.4);//低分
 
-        int stunum = list.size();//参与统计学生人数
-        DoubleSummaryStatistics statistics = list.stream().mapToDouble(s -> s.getScore()).summaryStatistics();
+        List<ERstudent> list2;//参与统计学生列表
+        if (stuzero.equals(0)) {//0分学生不参与统计
+            list2 = list.stream().filter(s -> s.getScore() > 0).collect(Collectors.toList());
+        } else {
+            list2 = list;
+        }
+
+        DoubleSummaryStatistics statistics = list2.stream().mapToDouble(s -> s.getScore()).summaryStatistics();
         double maxscore = statistics.getMax();
-        double minscore = statistics.getMin();
+        double minscore = list.stream().mapToDouble(s -> s.getScore()).summaryStatistics().getMin();
         double avgscore = N_Utils.formatDouble(statistics.getAverage(), 2);
         if (N_Utils.isListEmpty(list)) {
             maxscore = 0;
@@ -417,19 +420,20 @@ public class EReportGenerateService {
         rs.setMaxscore(maxscore);
         rs.setMinscore(minscore);
         rs.setAvgscore(avgscore);
-        int yxnum = list.stream().filter(l -> l.getScore().compareTo(yxscore) != -1)
+        int stunum = list2.size();//参与统计学生人数
+        int yxnum = list2.stream().filter(l -> l.getScore().compareTo(yxscore) != -1)
                 .collect(Collectors.toList()).size();
-        int lhnum = list.stream().filter(l -> l.getScore().compareTo(lhscore) != -1)
+        int lhnum = list2.stream().filter(l -> l.getScore().compareTo(lhscore) != -1)
                 .collect(Collectors.toList()).size();
-        int jgnum = list.stream().filter(l -> l.getScore().compareTo(jgscore) != -1)
+        int jgnum = list2.stream().filter(l -> l.getScore().compareTo(jgscore) != -1)
                 .collect(Collectors.toList()).size();
-        int dfnum = list.stream().filter(l -> l.getScore().compareTo(dfscore) != 1)
+        int dfnum = list2.stream().filter(l -> l.getScore().compareTo(dfscore) != 1)
                 .collect(Collectors.toList()).size();
-        List<Double> scores = list.stream().map(l -> l.getScore()).collect(Collectors.toList());
         rs.setYxrate(N_Utils.getIntegerDivideAndMulitiply(yxnum, stunum));
         rs.setLhrate(N_Utils.getIntegerDivideAndMulitiply(lhnum, stunum));
         rs.setJgrate(N_Utils.getIntegerDivideAndMulitiply(jgnum, stunum));
         rs.setDfrate(N_Utils.getIntegerDivideAndMulitiply(dfnum, stunum));
+        List<Double> scores = list.stream().map(l -> l.getScore()).collect(Collectors.toList());
         double qkbzc = ExamUtil.standardDiviation(scores);
         rs.setBzc(qkbzc);
         int sknum = list.stream().filter(l -> l.getSstate() == 2)
@@ -442,10 +446,15 @@ public class EReportGenerateService {
         for (Map.Entry<Integer, List<ERstudent>> entry : claCollect.entrySet()) {
             Integer classid = entry.getKey();
             List<ERstudent> rstudentList = entry.getValue();
-            DoubleSummaryStatistics claStatistics = rstudentList.stream().mapToDouble(s -> s.getScore()).summaryStatistics();
-
+            List<ERstudent> rstudentList2;//参与统计学生列表
+            if (stuzero.equals(0)) {//0分学生不参与统计
+                rstudentList2 = rstudentList.stream().filter(s -> s.getScore() > 0).collect(Collectors.toList());
+            } else {
+                rstudentList2 = list;
+            }
+            DoubleSummaryStatistics claStatistics = rstudentList2.stream().mapToDouble(s -> s.getScore()).summaryStatistics();
             double clamaxscore = claStatistics.getMax();
-            double claminscore = claStatistics.getMin();
+            double claminscore = rstudentList.stream().mapToDouble(s -> s.getScore()).summaryStatistics().getMin();
             double claavgscore = N_Utils.formatDouble(claStatistics.getAverage(), 2);
             if (N_Utils.isListEmpty(list)) {
                 clamaxscore = 0;
@@ -468,17 +477,17 @@ public class EReportGenerateService {
             sknum = rstudentList.stream().filter(l -> l.getSstate() == 2)
                     .map(l -> l.getStudentid()).distinct().collect(Collectors.toList()).size();
             rc.setStunum(sknum);//实考人数
-            stunum = rstudentList.size();//参与统计学生人数
             rc.setMissnum(fbstunum - sknum);//缺考人数=计划人数-实考人数
-            yxnum = rstudentList.stream().filter(l -> l.getScore().compareTo(yxscore) != -1)
+            scores = rstudentList.stream().map(l -> l.getScore()).collect(Collectors.toList());
+            stunum = rstudentList2.size();//参与统计学生人数
+            yxnum = rstudentList2.stream().filter(l -> l.getScore().compareTo(yxscore) != -1)
                     .collect(Collectors.toList()).size();
-            lhnum = rstudentList.stream().filter(l -> l.getScore().compareTo(lhscore) != -1)
+            lhnum = rstudentList2.stream().filter(l -> l.getScore().compareTo(lhscore) != -1)
                     .collect(Collectors.toList()).size();
-            jgnum = rstudentList.stream().filter(l -> l.getScore().compareTo(jgscore) != -1)
+            jgnum = rstudentList2.stream().filter(l -> l.getScore().compareTo(jgscore) != -1)
                     .collect(Collectors.toList()).size();
-            dfnum = rstudentList.stream().filter(l -> l.getScore().compareTo(dfscore) != 1)
+            dfnum = rstudentList2.stream().filter(l -> l.getScore().compareTo(dfscore) != 1)
                     .collect(Collectors.toList()).size();
-            scores = rstudentList.stream().map(l -> l.getScore()).collect(Collectors.toList());
             rc.setYxrate(N_Utils.getIntegerDivideAndMulitiply(yxnum, stunum));
             rc.setLhrate(N_Utils.getIntegerDivideAndMulitiply(lhnum, stunum));
             rc.setJgrate(N_Utils.getIntegerDivideAndMulitiply(jgnum, stunum));