Merge remote-tracking branch 'cloud-schoolapi/ywx'

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

@@ -182,8 +182,6 @@ public class EReportGenerateService {
         }
 
         DoubleSummaryStatistics schoolStatistics = schoolStudents.stream().mapToDouble(s -> s.getScore()).summaryStatistics();
-        DoubleSummaryStatistics classStatistics = classStudents.stream().mapToDouble(s -> s.getScore()).summaryStatistics();
-        DoubleSummaryStatistics cSStatistics = classSubjectStudents.stream().mapToDouble(s -> s.getScore()).summaryStatistics();
         double schoolStatisticsMax = schoolStatistics.getMax();
         double schoolStatisticsAverage = N_Utils.formatDouble(schoolStatistics.getAverage(), 2);
         double schoolStatisticsMin = schoolStatistics.getMin();
@@ -238,16 +236,18 @@ public class EReportGenerateService {
 
         setRank(schoolStudents, schoolStuRank, 1);//学校学生分数排名
 
+        Map<String, ERclass> rclassMap = classList.stream().collect(Collectors.toMap(c -> (c.getClassid() + "_" + c.getSubjectid()), c -> c));
         Map<String, Double> bzcMap = subjectList.stream().collect(Collectors.toMap(ERsubject::getSubjectid, ERsubject::getBzc));
         for (ERstudent cs : classStudents) {
             Integer studentid = cs.getStudentid();
             cs.setClassrank(classStuRank.get(cs.getClassid() + "_" + studentid));
-            cs.setClassmaxscore(classStatistics.getMax());
-            cs.setClassavgscore(N_Utils.formatDouble(classStatistics.getAverage(), 2));
+            ERclass rclass = rclassMap.get(cs.getClassid() + "_" + cs.getSubjectid());
+            cs.setClassmaxscore(rclass.getClassmaxscore());
+            cs.setClassavgscore(rclass.getClassavgscore());
             Integer schoolrank = schoolStuRank.get(studentid.toString());
             cs.setSchoolrank(schoolrank);
-            cs.setSchoolmaxscore(schoolStatisticsMax);
-            cs.setSchoolavgscore(schoolStatisticsAverage);
+            cs.setSchoolmaxscore(rclass.getSchoolmaxscore());
+            cs.setSchoolavgscore(rclass.getSchoolavgscore());
             setStuGoal(stuRankGoals, cs, schoolrank);//设置学生目标
             Double bzc = bzcMap.get(cs.getSubjectid());
             cs.setBzscore(ExamUtil.standardScore(cs.getScore(), cs.getSchoolavgscore(), bzc));//学生标准分
@@ -260,13 +260,14 @@ public class EReportGenerateService {
             Integer classid = cs.getClassid();
             subjectid = cs.getSubjectid();
             cs.setClassrank(classSubStuRank.get(classid + "_" + subjectid + "_" + studentid));
-            cs.setClassmaxscore(cSStatistics.getMax());
-            cs.setClassavgscore(N_Utils.formatDouble(cSStatistics.getAverage(), 2));
+            ERclass rclass = rclassMap.get(classid + "_" + subjectid);
+            cs.setClassmaxscore(rclass.getClassmaxscore());
+            cs.setClassavgscore(rclass.getClassavgscore());
             Integer schoolrank = schoolSubStuRank.get(subjectid + "_" + studentid);
             cs.setSchoolrank(schoolrank);
             cs.setZfSchoolRank(schoolStuRank.get(studentid.toString()));
-            cs.setSchoolmaxscore(sSStatistics.getMax());
-            cs.setSchoolavgscore(N_Utils.formatDouble(sSStatistics.getAverage(), 2));
+            cs.setSchoolmaxscore(rclass.getSchoolmaxscore());
+            cs.setSchoolavgscore(rclass.getSchoolavgscore());
             setStuGoal(stuRankGoals, cs, schoolrank);//设置学生目标
             Double bzc = bzcMap.get(subjectid);
             cs.setBzscore(ExamUtil.standardScore(cs.getScore(), cs.getSchoolavgscore(), bzc));//学生标准分