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

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

@@ -27,7 +27,6 @@ import com.xhkjedu.sexam.vo.report.ERPointStuScoreVo;
 import com.xhkjedu.sexam.vo.report.ExamPaperClassVo;
 import com.xhkjedu.sexam.vo.system.UserVo;
 import com.xhkjedu.utils.N_Utils;
-import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -123,8 +122,10 @@ public class EReportGenerateService {
         for (Map.Entry<Integer, List<ERstudent>> entry : schoolCollect.entrySet()) {
             Integer studentid = entry.getKey();
             ERstudent cs = new ERstudent();
+            List<ERstudent> list = entry.getValue();
+            cs.setClassid(list.get(0).getClassid());
             cs.setStudentid(studentid);
-            cs.setScore(entry.getValue().stream().mapToDouble(s -> s.getScore()).sum());
+            cs.setScore(list.stream().mapToDouble(s -> s.getScore()).sum());
             schoolStudents.add(cs);
         }
         Map<Integer, List<ERstudent>> cCollect = students.stream().collect(Collectors.groupingBy(s -> s.getClassid()));
@@ -169,7 +170,7 @@ public class EReportGenerateService {
         rbase.setClassnum(classnum);
         rbase.setStunum(stunum);
         rbase.setMissnum(students.stream().filter(l -> l.getSstate() == 3)
-                                 .map(l -> l.getStudentid()).distinct().collect(Collectors.toList()).size());
+                .map(l -> l.getStudentid()).distinct().collect(Collectors.toList()).size());
         rbase.setSubjectnum(subjectnum);
         rbase.setMaxscore(schoolStatisticsMax);
         rbase.setAvgscore(schoolStatisticsAverage);
@@ -179,6 +180,8 @@ public class EReportGenerateService {
         Map<String, List<ERstudent>> subCollect = students.stream().collect(Collectors.groupingBy(s -> s.getSubjectid()));
         List<ERsubject> subjectList = new ArrayList<>();//考试报告科目情况
         List<ERclass> classList = new ArrayList<>();//考试报告班级情况
+        setSubject(examid, stunum, "zf", "总分", subjectList, classList, schoolStudents
+                , papers.stream().mapToDouble(p -> p.getPscore()).sum());
         for (Map.Entry<String, List<ERstudent>> ssEntry : subCollect.entrySet()) {
             subjectid = ssEntry.getKey();
             subjectname = subjectMap.get(subjectid);
@@ -195,74 +198,7 @@ public class EReportGenerateService {
             }
             ERPaperVo rp = paperMap.get(subjectid);
             Double allscore = rp.getPscore();//满分
-            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);//低分
-
-            DoubleSummaryStatistics statistics = list.stream().mapToDouble(s -> s.getScore()).summaryStatistics();
-            ERsubject rs = new ERsubject();
-            rs.setExamid(examid);
-            rs.setSubjectid(subjectid);
-            rs.setSubjectname(subjectname);
-            rs.setScore(allscore);
-            rs.setMaxscore(statistics.getMax());
-            rs.setMinscore(statistics.getMin());
-            rs.setAvgscore(N_Utils.formatDouble(statistics.getAverage(), 2));
-            int yxnum = list.stream().filter(l -> l.getScore().compareTo(yxscore) != -1)
-                            .collect(Collectors.toList()).size();
-            int lhnum = list.stream().filter(l -> l.getScore().compareTo(lhscore) != -1)
-                            .collect(Collectors.toList()).size();
-            int jgnum = list.stream().filter(l -> l.getScore().compareTo(jgscore) != -1)
-                            .collect(Collectors.toList()).size();
-            int dfnum = list.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));
-            rs.setBzc(ExamUtil.standardDiviation(scores));
-            int sknum = list.size();
-            rs.setStunum(sknum);//实考人数
-            rs.setMissnum(stunum - sknum);//缺考人数=计划人数-实考人数
-            subjectList.add(rs);
-
-            Map<Integer, List<ERstudent>> claCollect = list.stream().collect(Collectors.groupingBy(s -> s.getClassid()));
-            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();
-                ERclass rc = new ERclass();
-                rc.setExamid(examid);
-                rc.setClassid(classid);
-                rc.setSubjectid(subjectid);
-                rc.setSubjectname(subjectname);
-                rc.setAllscore(allscore);
-                rc.setClassmaxscore(claStatistics.getMax());
-                rc.setClassminscore(claStatistics.getMin());
-                rc.setClassavgscore(N_Utils.formatDouble(claStatistics.getAverage(), 2));
-                rc.setSchoolmaxscore(statistics.getMax());
-                rc.setSchoolavgscore(N_Utils.formatDouble(statistics.getAverage(), 2));
-                sknum = rstudentList.size();
-                rc.setStunum(sknum);//实考人数
-                rc.setMissnum(stunum - sknum);//缺考人数=计划人数-实考人数
-                yxnum = rstudentList.stream().filter(l -> l.getScore().compareTo(yxscore) != -1)
-                                    .collect(Collectors.toList()).size();
-                lhnum = rstudentList.stream().filter(l -> l.getScore().compareTo(lhscore) != -1)
-                                    .collect(Collectors.toList()).size();
-                jgnum = rstudentList.stream().filter(l -> l.getScore().compareTo(jgscore) != -1)
-                                    .collect(Collectors.toList()).size();
-                dfnum = rstudentList.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));
-                rc.setDfrate(N_Utils.getIntegerDivideAndMulitiply(dfnum, stunum));
-                rc.setBzc(ExamUtil.standardDiviation(scores));
-                classList.add(rc);
-            }
+            setSubject(examid, stunum, subjectid, subjectname, subjectList, classList, list, allscore);
         }
 
         setClassAvgRank(classList);//班级科目平均分排名
@@ -312,14 +248,87 @@ public class EReportGenerateService {
         setAction(examid, subjectMap, userMap);//行为分析
     }
 
+    //科目统计
+    private void setSubject(Integer examid, int stunum, String subjectid, String subjectname, List<ERsubject> subjectList,
+                            List<ERclass> classList, List<ERstudent> list, Double allscore) {
+        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);//低分
+
+        DoubleSummaryStatistics statistics = list.stream().mapToDouble(s -> s.getScore()).summaryStatistics();
+        ERsubject rs = new ERsubject();
+        rs.setExamid(examid);
+        rs.setSubjectid(subjectid);
+        rs.setSubjectname(subjectname);
+        rs.setScore(allscore);
+        rs.setMaxscore(statistics.getMax());
+        rs.setMinscore(statistics.getMin());
+        rs.setAvgscore(N_Utils.formatDouble(statistics.getAverage(), 2));
+        int yxnum = list.stream().filter(l -> l.getScore().compareTo(yxscore) != -1)
+                .collect(Collectors.toList()).size();
+        int lhnum = list.stream().filter(l -> l.getScore().compareTo(lhscore) != -1)
+                .collect(Collectors.toList()).size();
+        int jgnum = list.stream().filter(l -> l.getScore().compareTo(jgscore) != -1)
+                .collect(Collectors.toList()).size();
+        int dfnum = list.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));
+        rs.setBzc(ExamUtil.standardDiviation(scores));
+        int sknum = list.size();
+        rs.setStunum(sknum);//实考人数
+        rs.setMissnum(stunum - sknum);//缺考人数=计划人数-实考人数
+        subjectList.add(rs);
+
+        Map<Integer, List<ERstudent>> claCollect = list.stream().collect(Collectors.groupingBy(s -> s.getClassid()));
+        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();
+            ERclass rc = new ERclass();
+            rc.setExamid(examid);
+            rc.setClassid(classid);
+            rc.setSubjectid(subjectid);
+            rc.setSubjectname(subjectname);
+            rc.setAllscore(allscore);
+            rc.setClassmaxscore(claStatistics.getMax());
+            rc.setClassminscore(claStatistics.getMin());
+            rc.setClassavgscore(N_Utils.formatDouble(claStatistics.getAverage(), 2));
+            rc.setSchoolmaxscore(statistics.getMax());
+            rc.setSchoolavgscore(N_Utils.formatDouble(statistics.getAverage(), 2));
+            sknum = rstudentList.size();
+            rc.setStunum(sknum);//实考人数
+            rc.setMissnum(stunum - sknum);//缺考人数=计划人数-实考人数
+            yxnum = rstudentList.stream().filter(l -> l.getScore().compareTo(yxscore) != -1)
+                    .collect(Collectors.toList()).size();
+            lhnum = rstudentList.stream().filter(l -> l.getScore().compareTo(lhscore) != -1)
+                    .collect(Collectors.toList()).size();
+            jgnum = rstudentList.stream().filter(l -> l.getScore().compareTo(jgscore) != -1)
+                    .collect(Collectors.toList()).size();
+            dfnum = rstudentList.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));
+            rc.setDfrate(N_Utils.getIntegerDivideAndMulitiply(dfnum, stunum));
+            rc.setBzc(ExamUtil.standardDiviation(scores));
+            classList.add(rc);
+        }
+    }
+
     //班级科目平均分排名
     private void setClassAvgRank(List<ERclass> classList) {
         Map<String, Integer> classSubRank = new HashMap<>();
         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()) {
@@ -499,7 +508,14 @@ public class EReportGenerateService {
             , List<ERrank> rranks, Integer createid, Map<Integer, String> userMap) {
         Map<String, Double> scoreMap = papers.stream().collect(Collectors.toMap(p -> p.getSubjectid(), p -> p.getPscore()));//考试总分
         Double pscore;//试卷总分
-
+        Double zfscore = papers.stream().mapToDouble(p -> p.getPscore()).sum();//考试总分
+        List<ERstudent> cstudents = new ArrayList<>();//班级学生
+        Map<String, List<ERstudent>> cscollect = students.stream().collect(
+                Collectors.groupingBy(s -> s.getClassid() + "_" + s.getStudentid()));
+        setStuScore(cscollect, cstudents);
+        //总分统计
+        Map<Integer, List<ERstudent>> zfcollect = cstudents.stream().collect(
+                Collectors.groupingBy(s -> s.getClassid()));
         List<ERstudent> sstudents = new ArrayList<>();//科目学生
         Map<String, List<ERstudent>> sscollect = students.stream().collect(
                 Collectors.groupingBy(s -> s.getSubjectid() + "_" + s.getStudentid()));
@@ -513,24 +529,50 @@ public class EReportGenerateService {
         ERrank eRrank = rranks.get(0);
         Integer ranktype = eRrank.getRanktype();
         if (ranktype == 1) {//等级（A[85%~100%],B[70%~85%),C[60%~70%),D[40%~60%),E[0%~40%)）
-            for (ERrank rrank : rranks) {
-                Double maxrate = rrank.getMaxscore();
-                Double minrate = rrank.getMinscore();
+            for (ERrank rank : rranks) {
+                Double maxrate = rank.getMaxscore();
+                Double minrate = rank.getMinscore();
+                //总分统计
+                double zfmaxscore = ExamUtil.mul(maxrate, zfscore);
+                double zfminscore = ExamUtil.mul(minrate, zfscore);
+                ERrank rr = new ERrank();
+                String rankname = rank.getRankname();
+                rr.setRanktype(ranktype);
+                rr.setRankname(rankname);
+                rr.setMaxscore(zfmaxscore);
+                rr.setMinscore(zfminscore);
+                rr.setSubjectid("zf");
+                String zfrankrange = "[" + zfminscore + "," + zfmaxscore;
+                if (rr.getRankname().equals("A")) {
+                    zfrankrange = zfrankrange + "]";
+                } else {
+                    zfrankrange = zfrankrange + ")";
+                }
+                for (Map.Entry<Integer, List<ERstudent>> entry : zfcollect.entrySet()) {
+                    Integer classid = entry.getKey();
+                    String subjectid = "zf";
+                    List<ERstudent> list = entry.getValue();
+                    setDjTj(examid, userMap, rclassRankList, rr, zfrankrange, subjectid, classid, list);
+                }
+                IntSummaryStatistics zfstatistics = cstudents.stream().mapToInt(s -> s.getSchoolrank()).summaryStatistics();
+                rr.setLinescore(zfstatistics.getMax());
+                rr.setFloatscore(zfstatistics.getMin());
+                rrankList.add(rr);
 
                 //分科统计
                 for (ERPaperVo paper : papers) {
                     String subjectid = paper.getSubjectid();
+                    ERrank rrank = new ERrank();
+                    rrank.setRanktype(ranktype);
+                    rrank.setRankname(rankname);
                     rrank.setSubjectid(subjectid);
                     pscore = scoreMap.get(subjectid);
                     double maxscore = ExamUtil.mul(maxrate, pscore);
                     double minscore = ExamUtil.mul(minrate, pscore);
                     rrank.setMaxscore(maxscore);
                     rrank.setMinscore(minscore);
-                    ERrank rrank1 = new ERrank();
-                    BeanUtils.copyProperties(rrank, rrank1);
-
                     String rankrange = "[" + minscore + "," + maxscore;
-                    if (rrank.getRankname().equals("A")) {
+                    if (rankname.equals("A")) {
                         rankrange = rankrange + "]";
                     } else {
                         rankrange = rankrange + ")";
@@ -541,13 +583,13 @@ public class EReportGenerateService {
                     List<ERstudent> list = qbbjcollect.get(subjectid);
                     setDjTj(examid, userMap, rclassRankList, rrank, rankrange, subjectid, classid, list);
                     IntSummaryStatistics statistics = list.stream().mapToInt(s -> s.getSchoolrank()).summaryStatistics();
-                    rrank1.setLinescore(statistics.getMax());
-                    rrank1.setFloatscore(statistics.getMin());
-                    rrankList.add(rrank1);
+                    rrank.setLinescore(statistics.getMax());
+                    rrank.setFloatscore(statistics.getMin());
+                    rrankList.add(rrank);
 
                     //班级科目统计
                     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();
@@ -557,6 +599,35 @@ public class EReportGenerateService {
             }
         } else if (ranktype == 2) {//分数段（10分/段）
             Integer linescore = eRrank.getLinescore();
+            //总分统计
+            Integer gnum = ExamUtil.divUp(zfscore, linescore);
+            for (Integer i = 1; i <= gnum; i++) {
+                ERrank rrank = new ERrank();
+                rrank.setRanktype(ranktype);
+                double maxscore = ExamUtil.mul(i, linescore);
+                double minscore = ExamUtil.mul(i - 1, linescore);
+                if (maxscore > zfscore) {
+                    maxscore = zfscore;
+                }
+                rrank.setMaxscore(maxscore);
+                rrank.setMinscore(minscore);
+                String rankrange = "[" + minscore + "," + maxscore;
+                if (i == gnum) {
+                    rankrange = rankrange + "]";
+                } else {
+                    rankrange = rankrange + ")";
+                }
+                rrank.setRankname(rankrange);
+                rrank.setSubjectid("zf");
+                rrankList.add(rrank);
+
+                for (Map.Entry<Integer, List<ERstudent>> entry : zfcollect.entrySet()) {
+                    Integer classid = entry.getKey();
+                    String subjectid = "zf";
+                    List<ERstudent> list = entry.getValue();
+                    setFdTj(examid, userMap, rclassRankList, gnum, i, rrank, rankrange, classid, list);
+                }
+            }
 
             //分科统计
             for (ERPaperVo paper : papers) {
@@ -582,9 +653,7 @@ public class EReportGenerateService {
                         rankrange = rankrange + ")";
                     }
                     rrank.setRankname(rankrange);
-                    ERrank rrank1 = new ERrank();
-                    BeanUtils.copyProperties(rrank, rrank1);
-                    rrankList.add(rrank1);
+                    rrankList.add(rrank);
 
                     //全部班级统计
                     Integer classid = 0;
@@ -593,7 +662,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();
@@ -601,144 +670,212 @@ public class EReportGenerateService {
                     }
                 }
             }
-        } else if (ranktype == 3) {//临界分（临界分：总分*80%，浮动分：5分）
-            Integer linescore = eRrank.getLinescore();
-            Integer floatscore = eRrank.getFloatscore();
-            ERrank rrank = new ERrank();
-            rrank.setRanktype(ranktype);
+        } else {
+            Integer lscore = eRrank.getLinescore();
+            if (ranktype == 3) {//临界分（临界分：总分*80%，浮动分：5分）
+                Integer linescore = lscore;
+                Integer floatscore = eRrank.getFloatscore();
+                ERrank rr = new ERrank();
+                rr.setRanktype(ranktype);
+                //总分统计
+                if (N_Utils.isEmptyInteger(linescore)) linescore = (int) (ExamUtil.mul(zfscore, 0.8));
+                double zfmaxscore = ExamUtil.add(linescore, floatscore);
+                double zfminscore = ExamUtil.sub(linescore, floatscore);
+                if (zfmaxscore > zfscore) zfmaxscore = zfscore;
+                if (zfminscore < 0) zfminscore = 0;
+                rr.setMaxscore(zfmaxscore);
+                rr.setMinscore(zfminscore);
+                rr.setLinescore(linescore);
+                rr.setFloatscore(floatscore);
+                String zfrankrange = "[" + zfminscore + "," + zfmaxscore + "]";
+                rr.setRankname(zfrankrange);
+                rr.setSubjectid("zf");
+                rrankList.add(rr);
+
+                for (Map.Entry<Integer, List<ERstudent>> entry : zfcollect.entrySet()) {
+                    Integer classid = entry.getKey();
+                    String subjectid = "zf";
+                    List<ERstudent> list = entry.getValue();
+                    setLjfTj(examid, userMap, rclassRankList, rr, zfrankrange, classid, subjectid, list);
+                }
 
-            //分科统计
-            for (ERPaperVo paper : papers) {
-                String subjectid = paper.getSubjectid();
-                rrank.setSubjectid(subjectid);
-                pscore = scoreMap.get(subjectid);
-                if (N_Utils.isEmptyInteger(linescore)) linescore = (int) (ExamUtil.mul(pscore, 0.8));
-                double maxscore = ExamUtil.add(linescore, floatscore);
-                double minscore = ExamUtil.sub(linescore, floatscore);
-                if (maxscore > pscore) maxscore = pscore;
-                if (minscore < 0) minscore = 0;
-                rrank.setMaxscore(maxscore);
-                rrank.setMinscore(minscore);
-                rrank.setLinescore(linescore);
-                rrank.setFloatscore(floatscore);
-                String rankrange = "[" + minscore + "," + maxscore + "]";
-                rrank.setRankname(rankrange);
-                ERrank rrank1 = new ERrank();
-                BeanUtils.copyProperties(rrank, rrank1);
-                rrankList.add(rrank1);
-
-                //全部班级统计
-                Integer classid = 0;
-                List<ERstudent> list = qbbjcollect.get(subjectid);
-                setLjfTj(examid, userMap, rclassRankList, rrank, rankrange, classid, subjectid, list);
-
-                //班级科目统计
-                Map<Integer, List<ERstudent>> ccollect = students.stream().filter(s -> s.getSubjectid().equals(subjectid))
-                                                                 .collect(Collectors.groupingBy(s -> s.getClassid()));
-                for (Map.Entry<Integer, List<ERstudent>> entry : ccollect.entrySet()) {
-                    classid = entry.getKey();
-                    list = entry.getValue();
+                //分科统计
+                for (ERPaperVo paper : papers) {
+                    String subjectid = paper.getSubjectid();
+                    ERrank rrank = new ERrank();
+                    rrank.setRanktype(ranktype);
+                    rrank.setSubjectid(subjectid);
+                    pscore = scoreMap.get(subjectid);
+                    linescore = lscore;
+                    if (N_Utils.isEmptyInteger(linescore)) linescore = (int) (ExamUtil.mul(pscore, 0.8));
+                    double maxscore = ExamUtil.add(linescore, floatscore);
+                    double minscore = ExamUtil.sub(linescore, floatscore);
+                    if (maxscore > pscore) maxscore = pscore;
+                    if (minscore < 0) minscore = 0;
+                    rrank.setMaxscore(maxscore);
+                    rrank.setMinscore(minscore);
+                    rrank.setLinescore(linescore);
+                    rrank.setFloatscore(floatscore);
+                    String rankrange = "[" + minscore + "," + maxscore + "]";
+                    rrank.setRankname(rankrange);
+                    rrankList.add(rrank);
+
+                    //全部班级统计
+                    Integer classid = 0;
+                    List<ERstudent> list = qbbjcollect.get(subjectid);
                     setLjfTj(examid, userMap, rclassRankList, rrank, rankrange, classid, subjectid, list);
+
+                    //班级科目统计
+                    Map<Integer, List<ERstudent>> ccollect = students.stream().filter(s -> s.getSubjectid().equals(subjectid))
+                            .collect(Collectors.groupingBy(s -> s.getClassid()));
+                    for (Map.Entry<Integer, List<ERstudent>> entry : ccollect.entrySet()) {
+                        classid = entry.getKey();
+                        list = entry.getValue();
+                        setLjfTj(examid, userMap, rclassRankList, rrank, rankrange, classid, subjectid, list);
+                    }
+                }
+            } else if (ranktype == 4) {//临界名次（临界名次10，浮动名次5）
+                Integer linescore = lscore;
+                Integer floatscore = eRrank.getFloatscore();
+                ERrank rr = new ERrank();
+                rr.setRanktype(ranktype);
+                //总分统计
+                double zfmaxscore = ExamUtil.sub(linescore, floatscore);//最高名次
+                double zfminscore = ExamUtil.add(linescore, floatscore);//最低名次
+                if (zfmaxscore < 1) zfmaxscore = 1;//最高名次为1
+                int zfstunum = (int) students.stream().map(s -> s.getStudentid()).distinct().count();//学生数量
+                if (zfminscore > zfstunum) zfminscore = zfstunum;//最低名次=学生数量
+                rr.setMaxscore(zfmaxscore);
+                rr.setMinscore(zfminscore);
+                rr.setLinescore(linescore);
+                rr.setFloatscore(floatscore);
+                String zfrankrange = "[" + zfminscore + "," + zfmaxscore + "]";
+                rr.setRankname(zfrankrange);
+                rr.setSubjectid("zf");
+                rrankList.add(rr);
+
+                for (Map.Entry<Integer, List<ERstudent>> entry : zfcollect.entrySet()) {
+                    Integer classid = entry.getKey();
+                    String subjectid = "zf";
+                    List<ERstudent> list = entry.getValue();
+                    setLjmcTj(examid, userMap, rclassRankList, rr, zfrankrange, classid, subjectid, list);
                 }
-            }
-        } else if (ranktype == 4) {//临界名次（临界名次10，浮动名次5）
-            Integer linescore = eRrank.getLinescore();
-            Integer floatscore = eRrank.getFloatscore();
-            ERrank rrank = new ERrank();
-            rrank.setRanktype(ranktype);
 
-            //分科统计
-            for (ERPaperVo paper : papers) {
-                String subjectid = paper.getSubjectid();
-                rrank.setSubjectid(subjectid);
-                double maxscore = ExamUtil.sub(linescore, floatscore);//最高名次
-                double minscore = ExamUtil.add(linescore, floatscore);//最低名次
-                if (maxscore < 1) maxscore = 1;//最高名次为1
-                Integer stunum = students.size();//学生数量
-                if (minscore > stunum) minscore = stunum;//最低名次=学生数量
-                rrank.setMaxscore(maxscore);
-                rrank.setMinscore(minscore);
-                rrank.setLinescore(linescore);
-                rrank.setFloatscore(floatscore);
-                String rankrange = "[" + minscore + "," + maxscore + "]";
-                rrank.setRankname(rankrange);
-                ERrank rrank1 = new ERrank();
-                BeanUtils.copyProperties(rrank, rrank1);
-                rrankList.add(rrank1);
-
-                //全部班级统计
-                Integer classid = 0;
-                List<ERstudent> list = qbbjcollect.get(subjectid);
-                setLjmcTj(examid, userMap, rclassRankList, rrank, rankrange, classid, subjectid, list);
-
-                //班级科目统计
-                Map<Integer, List<ERstudent>> ccollect = students.stream().filter(s -> s.getSubjectid().equals(subjectid))
-                                                                 .collect(Collectors.groupingBy(s -> s.getClassid()));
-                for (Map.Entry<Integer, List<ERstudent>> entry : ccollect.entrySet()) {
-                    classid = entry.getKey();
-                    list = entry.getValue();
+                //分科统计
+                for (ERPaperVo paper : papers) {
+                    String subjectid = paper.getSubjectid();
+                    double maxscore = ExamUtil.sub(linescore, floatscore);//最高名次
+                    double minscore = ExamUtil.add(linescore, floatscore);//最低名次
+                    if (maxscore < 1) maxscore = 1;//最高名次为1
+                    Integer stunum = students.size();//学生数量
+                    if (minscore > stunum) minscore = stunum;//最低名次=学生数量
+                    ERrank rrank = new ERrank();
+                    rrank.setRanktype(ranktype);
+                    rrank.setSubjectid(subjectid);
+                    rrank.setMaxscore(maxscore);
+                    rrank.setMinscore(minscore);
+                    rrank.setLinescore(linescore);
+                    rrank.setFloatscore(floatscore);
+                    String rankrange = "[" + minscore + "," + maxscore + "]";
+                    rrank.setRankname(rankrange);
+                    rrankList.add(rrank);
+
+                    //全部班级统计
+                    Integer classid = 0;
+                    List<ERstudent> list = qbbjcollect.get(subjectid);
                     setLjmcTj(examid, userMap, rclassRankList, rrank, rankrange, classid, subjectid, list);
+
+                    //班级科目统计
+                    Map<Integer, List<ERstudent>> ccollect = students.stream().filter(s -> s.getSubjectid().equals(subjectid))
+                            .collect(Collectors.groupingBy(s -> s.getClassid()));
+                    for (Map.Entry<Integer, List<ERstudent>> entry : ccollect.entrySet()) {
+                        classid = entry.getKey();
+                        list = entry.getValue();
+                        setLjmcTj(examid, userMap, rclassRankList, rrank, rankrange, classid, subjectid, list);
+                    }
+                }
+            } else if (ranktype == 5) {//优秀年级前（10名）
+                Integer linescore = lscore;
+                ERrank rr = new ERrank();
+                rr.setRanktype(ranktype);
+                rr.setLinescore(linescore);
+                String rankrange = "年级前" + linescore + "名";
+                rr.setRankname(rankrange);
+                //总分统计
+                rr.setSubjectid("zf");
+                rrankList.add(rr);
+                for (Map.Entry<Integer, List<ERstudent>> entry : zfcollect.entrySet()) {
+                    Integer classid = entry.getKey();
+                    String subjectid = "zf";
+                    List<ERstudent> list = entry.getValue();
+                    setNjqTj(examid, userMap, rclassRankList, rr, rankrange, classid, subjectid, list);
                 }
-            }
-        } else if (ranktype == 5) {//优秀年级前（10名）
-            Integer linescore = eRrank.getLinescore();
-            ERrank rrank = new ERrank();
-            rrank.setRanktype(ranktype);
-            rrank.setLinescore(linescore);
-            String rankrange = "年级前" + linescore + "名";
-            rrank.setRankname(rankrange);
 
-            //分科统计
-            for (ERPaperVo paper : papers) {
-                String subjectid = paper.getSubjectid();
-                rrank.setSubjectid(subjectid);
-                ERrank rrank1 = new ERrank();
-                BeanUtils.copyProperties(rrank, rrank1);
-                rrankList.add(rrank1);
-                //全部班级统计
-                Integer classid = 0;
-                List<ERstudent> list = qbbjcollect.get(subjectid);
-                setNjqTj(examid, userMap, rclassRankList, rrank, rankrange, classid, subjectid, list);
-
-                //班级科目统计
-                Map<Integer, List<ERstudent>> ccollect = students.stream().filter(s -> s.getSubjectid().equals(subjectid))
-                                                                 .collect(Collectors.groupingBy(s -> s.getClassid()));
-                for (Map.Entry<Integer, List<ERstudent>> entry : ccollect.entrySet()) {
-                    classid = entry.getKey();
-                    list = entry.getValue();
+                //分科统计
+                for (ERPaperVo paper : papers) {
+                    String subjectid = paper.getSubjectid();
+                    ERrank rrank = new ERrank();
+                    rrank.setRanktype(ranktype);
+                    rrank.setRankname(rankrange);
+                    rrank.setLinescore(linescore);
+                    rrank.setSubjectid(subjectid);
+                    rrankList.add(rrank);
+                    //全部班级统计
+                    Integer classid = 0;
+                    List<ERstudent> list = qbbjcollect.get(subjectid);
                     setNjqTj(examid, userMap, rclassRankList, rrank, rankrange, classid, subjectid, list);
+
+                    //班级科目统计
+                    Map<Integer, List<ERstudent>> ccollect = students.stream().filter(s -> s.getSubjectid().equals(subjectid))
+                            .collect(Collectors.groupingBy(s -> s.getClassid()));
+                    for (Map.Entry<Integer, List<ERstudent>> entry : ccollect.entrySet()) {
+                        classid = entry.getKey();
+                        list = entry.getValue();
+                        setNjqTj(examid, userMap, rclassRankList, rrank, rankrange, classid, subjectid, list);
+                    }
+                }
+            } else if (ranktype == 6) {//学困年级后（10名）
+                Integer linescore = lscore;
+                ERrank rr = new ERrank();
+                rr.setRanktype(ranktype);
+                rr.setLinescore(linescore);
+                String rankrange = "年级后" + linescore + "名";
+                rr.setRankname(rankrange);
+                //总分统计
+                rr.setSubjectid("zf");
+                rrankList.add(rr);
+                for (Map.Entry<Integer, List<ERstudent>> entry : zfcollect.entrySet()) {
+                    Integer classid = entry.getKey();
+                    String subjectid = "zf";
+                    List<ERstudent> list = entry.getValue();
+                    setNjqTj(examid, userMap, rclassRankList, rr, rankrange, classid, subjectid, list);
                 }
-            }
-        } else if (ranktype == 6) {//学困年级后（10名）
-            Integer linescore = eRrank.getLinescore();
-            ERrank rrank = new ERrank();
-            rrank.setRanktype(ranktype);
-            rrank.setLinescore(linescore);
-            String rankrange = "年级后" + linescore + "名";
-            rrank.setRankname(rankrange);
 
-            //分科统计
-            for (ERPaperVo paper : papers) {
-                String subjectid = paper.getSubjectid();
-                rrank.setSubjectid(subjectid);
-                ERrank rrank1 = new ERrank();
-                BeanUtils.copyProperties(rrank, rrank1);
-                rrank1.setMaxscore(null);
-                rrankList.add(rrank1);
-                //全部班级统计
-                Integer classid = 0;
-                List<ERstudent> list = qbbjcollect.get(subjectid);
-                rrank.setMaxscore(getMaxScore(list, linescore));
-                setNjhTj(examid, userMap, rclassRankList, rrank, rankrange, classid, subjectid, list);
-
-                //班级科目统计
-                Map<Integer, List<ERstudent>> ccollect = students.stream().filter(s -> s.getSubjectid().equals(subjectid))
-                                                                 .collect(Collectors.groupingBy(s -> s.getClassid()));
-                for (Map.Entry<Integer, List<ERstudent>> entry : ccollect.entrySet()) {
-                    classid = entry.getKey();
-                    list = entry.getValue();
+                //分科统计
+                for (ERPaperVo paper : papers) {
+                    String subjectid = paper.getSubjectid();
+                    ERrank rrank = new ERrank();
+                    rrank.setRanktype(ranktype);
+                    rrank.setRankname(rankrange);
+                    rrank.setLinescore(linescore);
+                    rrank.setSubjectid(subjectid);
+                    rrankList.add(rrank);
+                    //全部班级统计
+                    Integer classid = 0;
+                    List<ERstudent> list = qbbjcollect.get(subjectid);
                     rrank.setMaxscore(getMaxScore(list, linescore));
                     setNjhTj(examid, userMap, rclassRankList, rrank, rankrange, classid, subjectid, list);
+
+                    //班级科目统计
+                    Map<Integer, List<ERstudent>> ccollect = students.stream().filter(s -> s.getSubjectid().equals(subjectid))
+                            .collect(Collectors.groupingBy(s -> s.getClassid()));
+                    for (Map.Entry<Integer, List<ERstudent>> entry : ccollect.entrySet()) {
+                        classid = entry.getKey();
+                        list = entry.getValue();
+                        rrank.setMaxscore(getMaxScore(list, linescore));
+                        setNjhTj(examid, userMap, rclassRankList, rrank, rankrange, classid, subjectid, list);
+                    }
+                    rrank.setMaxscore(null);
                 }
             }
         }

sexam/src/main/resources/mapper/report/ERclassMapper.xml

@@ -17,7 +17,8 @@
         select er.allscore,er.classmaxscore,er.classminscore,er.classavgscore,er.schoolmaxscore,er.schoolavgscore
         ,er.stunum,er.missnum,er.yxrate,er.lhrate,er.jgrate,er.dfrate,er.bzc
         ,er.classid,(case when er.classid=0 then '全部班级' else ec.classname end)classname
-        ,(select s.subjectname from t_subject s where er.subjectid=s.subjectid)subjectname
+        ,(case when er.subjectid='zf' then '总分' else (select s.subjectname from t_subject s where
+                er.subjectid=s.subjectid) end)subjectname
         from e_rclass er left join e_class ec on er.examid = ec.examid and er.classid = ec.classid
         where er.examid=#{examid} and er.classid=#{classid}
     </select>

sexam/src/main/resources/mapper/report/ERclassRankMapper.xml

@@ -18,8 +18,10 @@
     <select id="listByExamAndClassId" resultType="java.util.Map">
         select err.ranktype,err.rankname,err.rankrange,err.stunum,err.stujson,err.sturate
         ,err.classid,(case when err.classid=0 then '全部班级' else ec.classname end)classname
+        ,(case when err.subjectid='zf' then '总分' else (select s.subjectname from t_subject s where
+        err.subjectid=s.subjectid) end)subjectname
         from e_rclass_rank err left join e_class ec on err.examid = ec.examid and err.classid = ec.classid
-        where err.examid=#{rank.examid} and and err.classid=#{rank.classid}
+        where err.examid=#{rank.examid} and err.classid=#{rank.classid}
         <if test="rank.ranktype!=null and rank.ranktype!=0">
             and err.ranktype=#{rank.ranktype}
         </if>

sexam/src/main/resources/mapper/report/EReportGenerateMapper.xml

@@ -14,6 +14,7 @@
     <delete id="deleteExamReport">
         delete from e_rbase where examid=#{examid};
         delete from e_rclass where examid=#{examid};
+        delete from e_rclass_action where examid=#{examid};
         delete from e_rclass_complexity where examid=#{examid};
         delete from e_rclass_point where examid=#{examid};
         delete from e_rclass_qtype where examid=#{examid};
@@ -21,6 +22,7 @@
         delete from e_rclass_rank where examid=#{examid};
         delete from e_rrank where examid=#{examid};
         delete from e_rstudent where examid=#{examid};
+        delete from e_rstudent_action where examid=#{examid};
         delete from e_rstudent_complexity where examid=#{examid};
         delete from e_rstudent_point where examid=#{examid};
         delete from e_rstudent_qtype where examid=#{examid};