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

smarking/src/main/java/com/xhkjedu/smarking/model/report/reportclass/MsrClassGoodbad.java

@@ -37,4 +37,10 @@ public class MsrClassGoodbad extends BaseBean {
     private Double dtgavgscore;
     //学科短板人数
     private Integer dbnum;
+    //优秀学生id字符串
+    private String stuids;
+    //待提高学生id字符串
+    private String stuids2;
+    //学科短板学生id字符串
+    private String stuids3;
 }

smarking/src/main/java/com/xhkjedu/smarking/model/report/reportclass/MsrClassNearline.java

@@ -57,4 +57,8 @@ public class MsrClassNearline extends BaseBean {
     private String stuids2;
     //临界生id字符串
     private String stuids3;
+    //累计上线学生id字符串
+    private String stuids4;
+    //总分上线学科未上线学生id字符串
+    private String stuids5;
 }

smarking/src/main/java/com/xhkjedu/smarking/service/papercheck/MsPaperCheckTeacherTaskService.java

@@ -406,14 +406,14 @@ public class MsPaperCheckTeacherTaskService {
                 checked = 3;
             }
             if (correcttype.equals(3)) {//按题块批阅
-                checkscore = questions.stream().map(MsPaperBlockQuestion::getMergescore).collect(Collectors.joining(";"));
+                checkscore = questions.stream().map(q -> q.getStuscore().toString()).collect(Collectors.joining(";"));
                 //题块批阅信息
                 MsPaperStudentBlock block = new MsPaperStudentBlock();
                 block.setMpsbid(mpsbid);
                 block.setChecked(checked);
                 block.setFirstcid(handleid);
                 block.setFirstcime(N_Utils.getSecondTimestamp());
-                String stuscores = questions.stream().map(MsPaperBlockQuestion::getMergestuscore).collect(Collectors.joining(";"));
+                String stuscores = questions.stream().map(q -> q.getStuscore().toString()).collect(Collectors.joining(";"));
                 block.setFirstccores(stuscores);
                 block.setFirstccore(arbitratescore);
                 block.setHasgood(hasgood);
@@ -438,12 +438,13 @@ public class MsPaperCheckTeacherTaskService {
                         studentQuestions.add(studentQuestion);
                     } else {
                         String[] mptqids = question.getMergeqid().split(",");
-                        String[] mergestuscore = question.getMergestuscore().split(",");
+                        String[] mergescores = question.getMergescore().split(",");
+                        double[] scores = setStuScore(mergescores, stuscore);//计算学生小题得分
                         for (int i = 0; i < mptqids.length; i++) {
                             MsPaperStudentQuestion studentQuestion = new MsPaperStudentQuestion();
                             studentQuestion.setMptqid(N_Utils.obj2Int(mptqids[i]));
-                            studentQuestion.setFirstccore(MarkingUtil.objToDouble(mergestuscore[i]));
-                            studentQuestion.setStuscore(MarkingUtil.objToDouble(mergestuscore[i]));
+                            studentQuestion.setFirstccore(scores[i]);
+                            studentQuestion.setStuscore(scores[i]);
                             studentQuestions.add(studentQuestion);
                         }
                     }
@@ -506,7 +507,7 @@ public class MsPaperCheckTeacherTaskService {
                 //题块批阅信息
                 MsPaperStudentBlock block = new MsPaperStudentBlock();
                 block.setMpsbid(mpsbid);
-                String stuscores = questions.stream().map(MsPaperBlockQuestion::getMergestuscore).collect(Collectors.joining(";"));
+                String stuscores = questions.stream().map(q -> q.getStuscore().toString()).collect(Collectors.joining(";"));
                 String[] cores = new String[0];
                 if (type.equals(1)) {
                     block.setFirstcid(handleid);
@@ -553,11 +554,7 @@ public class MsPaperCheckTeacherTaskService {
                     } else {
                         String[] mptqids = question.getMergeqid().split(",");
                         String[] mergescores = question.getMergescore().split(",");
-                        String[] mergestuscore = question.getMergestuscore().split(",");
-                        double[] scores = new double[mergestuscore.length];
-                        for (int i = 0; i < mergestuscore.length; i++) {
-                            scores[i]=MarkingUtil.objToDouble(mergestuscore[i]);
-                        }
+                        double[] scores = setStuScore(mergescores, stuscore);//计算学生小题得分
                         String[] cores2 = new String[0];
                         if (corrected) cores2 = cores[j].split(",");
                         for (int i = 0; i < mptqids.length; i++) {
@@ -639,6 +636,19 @@ public class MsPaperCheckTeacherTaskService {
         if (checked == 3) msPaperStudentMapper.updateStudentPaperScoreByMpsId(mpsid);//更新学生总分
     }
 
+    //计算学生小题得分
+    private double[] setStuScore(String[] mergescores, Double stuscore) {
+        double totalScore = 0;
+        for (String mergescore : mergescores) {
+            totalScore = MarkingUtil.add(mergescore, totalScore);
+        }
+        double[] scores = new double[mergescores.length];
+        for (int i = 0; i < mergescores.length; i++) {
+            scores[i] = MarkingUtil.mul(stuscore, MarkingUtil.div(mergescores[i], totalScore));
+        }
+        return scores;
+    }
+
     //最终得分计算
     private Double getUserScore(Integer finalscore, double addScore, Double roundvalue) {
         double score;

smarking/src/main/java/com/xhkjedu/smarking/service/report/reportother/MsrExamService.java

@@ -69,6 +69,8 @@ public class MsrExamService {
     private MsrClassSectionMapper msrClassSectionMapper;
     @Resource
     private MsrClassNearlineMapper msrClassNearlineMapper;
+    @Resource
+    private MsrClassGoodbadMapper msrClassGoodbadMapper;
 
 
     /**
@@ -370,10 +372,93 @@ public class MsrExamService {
         saveClassSection(examid, 1, "bj", msrStudents);//班级报告-分段统计
         saveClassSection(examid, 1, "jxzl", msrStudents);//教学质量-分段统计
         saveClassNearLine(examid, msrStudents);//分档上线统计
+        saveClassGoodBad(examid, "all", msrStudents);//重点学生-优劣名次统计
 
         examMapper.updateExamState(examid, 3);
     }
 
+    //重点学生-优劣名次统计
+    public void saveClassGoodBad(Integer examid, String all, List<MsrStudent> msrStudents) {
+        List<MsrReportparam> params = getMsrReportParams(examid, "keystu", all);
+        SzJsonVo fd = JSON.parseObject(params.get(0).getSzjson(), SzJsonVo.class);
+        List<MsrClassGoodbad> classGoodbads = new ArrayList<>();
+        String subjectid;
+        Map<String, List<MsrStudent>> collect = getSubjectCollect(msrStudents);
+        for (Map.Entry<String, List<MsrStudent>> entry : collect.entrySet()) {
+            Integer classid = 0;
+            subjectid = entry.getKey();
+            studentsDistinct(entry);
+            setClassGoodBag(examid, entry, fd, subjectid, classid, classGoodbads);
+        }
+        Map<String, List<MsrStudent>> scCollect = msrStudents.stream().collect(Collectors.groupingBy(s -> s.getClassid() + "_" + s.getSubjectid()));
+        for (Map.Entry<String, List<MsrStudent>> entry : scCollect.entrySet()) {
+            String key = entry.getKey();
+            Integer classid = N_Utils.obj2Int(key.split("_")[0]);
+            subjectid = key.split("_")[1];
+            setClassGoodBag(examid, entry, fd, subjectid, classid, classGoodbads);
+        }
+        msrClassGoodbadMapper.insertList(classGoodbads);
+    }
+
+    //学生去重
+    private void studentsDistinct(Map.Entry<String, List<MsrStudent>> entry) {
+        //list根据学生id去重
+        Map<Integer, MsrStudent> map = new HashMap<>();
+        for (MsrStudent student : entry.getValue()) {
+            map.putIfAbsent(student.getStudentid(), student);
+        }
+        List<MsrStudent> list = map.values().stream().collect(Collectors.toList());
+        entry.setValue(list);
+    }
+
+    //重点学生-优劣名次计算
+    private void setClassGoodBag(Integer examid, Map.Entry<String, List<MsrStudent>> entry, SzJsonVo fd, String subjectid, Integer classid, List<MsrClassGoodbad> classGoodbads) {
+        int totalnum;
+        Integer goodtype = fd.getGoodtype();
+        Integer badtype = fd.getBadtype();
+        List<MsrStudent> studentList = entry.getValue().stream().sorted(Comparator.comparing(MsrStudent::getSchoolrank)).collect(Collectors.toList());
+        Double avgScore = N_Utils.formatDouble(studentList.stream().mapToDouble(MsrStudent::getStuscore).summaryStatistics().getAverage(), 2);
+        totalnum = studentList.size();//区间总人数
+        Integer goodvalue = fd.getGoodvalue();
+        Integer badvalue = fd.getBadvalue();
+        List<MsrStudent> yxStudents;//优秀学生列表
+        List<MsrStudent> dtgStudents;//待提高学生列表
+        List<MsrStudent> dbStudents;//学科短板学生列表
+        if (goodtype.equals(1)) {//按名次
+            yxStudents = studentList.stream().filter(s -> s.getSchoolrank().compareTo(goodvalue) <= 0).collect(Collectors.toList());
+        } else {//按比例
+            int index = (int) Math.ceil(MarkingUtil.div(totalnum * 100, goodvalue));
+            if (index > totalnum) index = totalnum;
+            yxStudents = studentList.subList(0, index);
+        }
+        if (badtype.equals(1)) {//按名次
+            dtgStudents = studentList.stream().filter(s -> s.getSchoolrank().compareTo(badvalue) <= 0).collect(Collectors.toList());
+        } else {//按比例
+            int index = (int) Math.ceil(MarkingUtil.div(totalnum * 100, badvalue));
+            if (index > totalnum) index = totalnum;
+            //取后index个
+            dtgStudents = studentList.subList(totalnum - index, totalnum);
+        }
+        dbStudents = studentList.stream().filter(s -> s.getStuscore().compareTo(avgScore) <= 0).collect(Collectors.toList());
+        int yxnum = yxStudents.size();
+        MsrClassGoodbad goodbad = new MsrClassGoodbad();
+        goodbad.setExamid(examid);
+        goodbad.setSubjectid(subjectid);
+        goodbad.setClassid(classid);
+        goodbad.setYxnum(yxnum);
+        goodbad.setYxrate(N_Utils.getIntegerDivideAndMulitiply(yxnum, totalnum));
+        goodbad.setYxavgscore(N_Utils.formatDouble(yxStudents.stream().mapToDouble(MsrStudent::getStuscore).summaryStatistics().getAverage(), 2));
+        int dtgnum = dtgStudents.size();
+        goodbad.setDtgnum(dtgnum);
+        goodbad.setDtgrate(N_Utils.getIntegerDivideAndMulitiply(dtgnum, totalnum));
+        goodbad.setDtgavgscore(N_Utils.formatDouble(dtgStudents.stream().mapToDouble(MsrStudent::getStuscore).summaryStatistics().getAverage(), 2));
+        goodbad.setDbnum(dbStudents.size());
+        goodbad.setStuids(yxStudents.stream().map(s -> s.getStudentid().toString()).collect(Collectors.joining(",")));
+        goodbad.setStuids2(dtgStudents.stream().map(s -> s.getStudentid().toString()).collect(Collectors.joining(",")));
+        goodbad.setStuids3(dbStudents.stream().map(s -> s.getStudentid().toString()).collect(Collectors.joining(",")));
+        classGoodbads.add(goodbad);
+    }
+
     //分档上线分析
     public void saveClassNearLine(Integer examid, List<MsrStudent> msrStudents) {
         List<MsrReportparam> params = getMsrReportParams(examid, "gradescore", "all");
@@ -386,113 +471,25 @@ public class MsrExamService {
         }
         params = getMsrReportParams(examid, "nearline", "all");
         List<SzJsonVo> vos = JSON.parseArray(params.get(0).getSzjson(), SzJsonVo.class);
-        Map<Integer, List<Integer>> zfSx = new HashMap<>();//学生总分是否上线
+        Map<Integer, List<Integer>> zfSx = null;//学生总分是否上线
         List<MsrClassNearline> classNearlines = new ArrayList<>();
         String subjectid;
-        int totalnum;
+        Map<String, List<MsrStudent>> collect0 = getSubjectCollect(msrStudents);
+        for (Map.Entry<String, List<MsrStudent>> entry : collect0.entrySet()) {
+            Integer classid = 0;
+            subjectid = entry.getKey();
+            studentsDistinct(entry);
+            if (subjectid.equals("zf")) {
+                zfSx = setZfsxMap(entry.getValue(), qjMap, tMap);
+            }
+            setClassNearLine(examid, entry, qjMap, subjectid, tMap, vos, classid, zfSx, classNearlines);
+        }
         Map<String, List<MsrStudent>> scCollect = msrStudents.stream().collect(Collectors.groupingBy(s -> s.getClassid() + "_" + s.getSubjectid()));
         for (Map.Entry<String, List<MsrStudent>> entry : scCollect.entrySet()) {
             String key = entry.getKey();
             Integer classid = N_Utils.obj2Int(key.split("_")[0]);
             subjectid = key.split("_")[1];
-            List<SzJsonVo> list = qjMap.get(subjectid);
-            Integer rptype = tMap.get(subjectid);
-            List<MsrStudent> studentList = entry.getValue();
-            if (rptype.equals(3)) {
-                studentList = studentList.stream().sorted(Comparator.comparing(MsrStudent::getStuscore).reversed()).collect(Collectors.toList());
-            }
-            totalnum = studentList.size();//区间总人数
-            Double max = null;
-            Integer minRank = null;
-            int minIndex = 0;
-            for (int i = 0; i < list.size(); i++) {
-                SzJsonVo fd = vos.get(i);
-                Double fdMaxScore = fd.getMaxvalue();//档位浮动分数
-                if (fdMaxScore == null) fdMaxScore = MarkingUtil.objToDouble(fd.getDjvalue());
-                Double fdMinScore = fd.getMinvalue();//档位浮动分数
-                if (fdMinScore == null) {
-                    fdMinScore = fdMaxScore;
-                }
-                SzJsonVo rg = list.get(i);
-                Object djvalue = rg.getDjvalue();
-                double dwscore;
-                List<MsrStudent> qjstudents;//上线学生列表
-                List<MsrStudent> ljstudents;//累计上线学生列表
-                if (rptype.equals(1)) {//按名次
-                    Integer rank = N_Utils.obj2Int(djvalue);
-                    ljstudents = studentList.stream().filter(s -> s.getSchoolrank().compareTo(rank) <= 0).collect(Collectors.toList());
-                    if (minRank == null) {
-                        qjstudents = studentList.stream().filter(s -> s.getSchoolrank().compareTo(rank) <= 0).collect(Collectors.toList());
-                    } else {
-                        Integer finalMinRank = minRank;
-                        qjstudents = studentList.stream().filter(s -> s.getSchoolrank().compareTo(finalMinRank) >= 0 && s.getSchoolrank().compareTo(rank) < 0).collect(Collectors.toList());
-                    }
-                    minRank = rank;
-                    dwscore = N_Utils.handleInfinity(qjstudents.stream().mapToDouble(MsrStudent::getStuscore).summaryStatistics().getMin());
-                } else if (rptype.equals(2)) {//按分数
-                    Double score = MarkingUtil.objToDouble(djvalue);
-                    ljstudents = studentList.stream().filter(s -> s.getStuscore().compareTo(score) >= 0).collect(Collectors.toList());
-                    if (max == null) {
-                        qjstudents = studentList.stream().filter(s -> s.getStuscore().compareTo(score) >= 0).collect(Collectors.toList());
-                    } else {
-                        Double finalMax = max;
-                        qjstudents = studentList.stream().filter(s -> s.getStuscore().compareTo(score) >= 0 && s.getStuscore().compareTo(finalMax) < 0).collect(Collectors.toList());
-                    }
-                    dwscore = MarkingUtil.objToDouble(djvalue);
-                    max = score;
-                    minRank = qjstudents.stream().mapToInt(MsrStudent::getSchoolrank).summaryStatistics().getMin();
-                } else {//按比例
-                    int index = (int) Math.ceil(MarkingUtil.div(totalnum * 100, djvalue));
-                    if (index > totalnum) index = totalnum;
-                    qjstudents = studentList.subList(minIndex, index);
-                    minIndex = index;
-                    DoubleSummaryStatistics statistics = qjstudents.stream().mapToDouble(MsrStudent::getStuscore).summaryStatistics();
-                    dwscore = N_Utils.handleInfinity(statistics.getMin());
-                    ljstudents = studentList.stream().filter(s -> s.getStuscore().compareTo(dwscore) >= 0).collect(Collectors.toList());
-                }
-                int qjnum = qjstudents.size();
-                MsrClassNearline nearline = new MsrClassNearline();
-                nearline.setExamid(examid);
-                nearline.setSubjectid(subjectid);
-                nearline.setClassid(classid);
-                Integer dworder = i + 1;
-                String dwname = N_Utils.NumberToChn(dworder) + "档";
-                nearline.setDwname(dwname);
-                nearline.setDworder(dworder);
-                nearline.setDwscore(dwscore);
-                nearline.setSxnum(qjnum);
-                nearline.setSxrate(N_Utils.getIntegerDivideAndMulitiply(qjnum, totalnum));
-                int ljsxnum = ljstudents.size();
-                nearline.setLjsxnum(ljsxnum);
-                nearline.setLjsxrate(N_Utils.getIntegerDivideAndMulitiply(ljsxnum, totalnum));
-                if ("zf".equals(subjectid)) {
-                    List<Integer> ids = qjstudents.stream().map(MsrStudent::getStudentid).collect(Collectors.toList());
-                    zfSx.put(dworder, ids);
-                } else {
-                    List<Integer> zfsxIds = zfSx.get(dworder);//总分上线学生id列表
-                    int zfsxnum = zfsxIds.size();
-                    List<MsrStudent> ssxIds = qjstudents.stream().filter(s -> zfsxIds.contains(s.getStudentid())).collect(Collectors.toList());
-                    Integer ssxnum = ssxIds.size();//双上线人数
-                    nearline.setSsxnum(ssxnum);
-                    nearline.setStuids2(ssxIds.stream().map(s -> s.getStudentid().toString()).collect(Collectors.joining(",")));
-                    //总分上线学科未上线人数
-                    List<Integer> dksxIds = qjstudents.stream().map(MsrStudent::getStudentid).collect(Collectors.toList());
-                    zfsxIds.removeAll(dksxIds);
-                    int zfsxxkwsxnum = zfsxIds.size();
-                    nearline.setZfsxxkwsxnum(zfsxxkwsxnum);
-                    nearline.setGxrate(N_Utils.getIntegerDivideAndMulitiply(qjnum, zfsxnum));
-                    nearline.setMzxrate(N_Utils.getIntegerDivideAndMulitiply(ssxnum, qjnum));
-                }
-                nearline.setSxrate(N_Utils.getIntegerDivideAndMulitiply(qjnum, totalnum));
-                double ljMax = MarkingUtil.add(dwscore, fdMaxScore);
-                double ljMin = MarkingUtil.sub(dwscore, fdMinScore);
-                List<MsrStudent> ljStudents = studentList.stream().filter(s -> s.getStuscore().compareTo(ljMax) <= 0 && s.getStuscore().compareTo(ljMin) >= 0).collect(Collectors.toList());
-                nearline.setLjsnum(ljStudents.size());
-                nearline.setStuids3(ljStudents.stream().map(s -> s.getStudentid().toString()).collect(Collectors.joining(",")));
-                String stuids = qjstudents.stream().map(s -> s.getStudentid().toString()).collect(Collectors.joining(","));
-                nearline.setStuids(stuids);
-                classNearlines.add(nearline);
-            }
+            setClassNearLine(examid, entry, qjMap, subjectid, tMap, vos, classid, zfSx, classNearlines);
         }
         Map<String, List<MsrClassNearline>> collect = classNearlines.stream().collect(Collectors.groupingBy(l -> l.getSubjectid() + "_" + l.getDworder()));
         for (Map.Entry<String, List<MsrClassNearline>> entry : collect.entrySet()) {
@@ -509,6 +506,170 @@ public class MsrExamService {
         msrClassNearlineMapper.insertList(classNearlines);
     }
 
+    //获取科学分组学生
+    private Map<String, List<MsrStudent>> getSubjectCollect(List<MsrStudent> msrStudents) {
+        return msrStudents.stream().collect(Collectors.groupingBy(s -> s.getSubjectid(), LinkedHashMap::new, Collectors.toList()));
+    }
+
+    //分档上线计算
+    private void setClassNearLine(Integer examid, Map.Entry<String, List<MsrStudent>> entry, Map<String, List<SzJsonVo>> qjMap
+            , String subjectid, Map<String, Integer> tMap, List<SzJsonVo> vos, Integer classid
+            , Map<Integer, List<Integer>> zfSx, List<MsrClassNearline> classNearlines) {
+        int totalnum;
+        List<SzJsonVo> list = qjMap.get(subjectid);
+        Integer rptype = tMap.get(subjectid);
+        List<MsrStudent> studentList = entry.getValue();
+        if (rptype.equals(3)) {
+            studentList = studentList.stream().sorted(Comparator.comparing(MsrStudent::getStuscore).reversed()).collect(Collectors.toList());
+        }
+        totalnum = studentList.size();//区间总人数
+        Double max = null;
+        Integer minRank = null;
+        int minIndex = 0;
+        for (int i = 0; i < list.size(); i++) {
+            SzJsonVo fd = vos.get(i);
+            Double fdMaxScore = fd.getMaxvalue();//档位浮动分数
+            if (fdMaxScore == null) fdMaxScore = MarkingUtil.objToDouble(fd.getDjvalue());
+            Double fdMinScore = fd.getMinvalue();//档位浮动分数
+            if (fdMinScore == null) {
+                fdMinScore = fdMaxScore;
+            }
+            SzJsonVo rg = list.get(i);
+            Object djvalue = rg.getDjvalue();
+            double dwscore;
+            List<MsrStudent> qjstudents;//上线学生列表
+            List<MsrStudent> ljstudents;//累计上线学生列表
+            if (rptype.equals(1)) {//按名次
+                Integer rank = N_Utils.obj2Int(djvalue);
+                ljstudents = studentList.stream().filter(s -> s.getSchoolrank().compareTo(rank) <= 0).collect(Collectors.toList());
+                if (minRank == null) {
+                    qjstudents = studentList.stream().filter(s -> s.getSchoolrank().compareTo(rank) <= 0).collect(Collectors.toList());
+                } else {
+                    Integer finalMinRank = minRank;
+                    qjstudents = studentList.stream().filter(s -> s.getSchoolrank().compareTo(finalMinRank) >= 0 && s.getSchoolrank().compareTo(rank) < 0).collect(Collectors.toList());
+                }
+                minRank = rank;
+                dwscore = N_Utils.handleInfinity(qjstudents.stream().mapToDouble(MsrStudent::getStuscore).summaryStatistics().getMin());
+            } else if (rptype.equals(2)) {//按分数
+                Double score = MarkingUtil.objToDouble(djvalue);
+                ljstudents = studentList.stream().filter(s -> s.getStuscore().compareTo(score) >= 0).collect(Collectors.toList());
+                if (max == null) {
+                    qjstudents = studentList.stream().filter(s -> s.getStuscore().compareTo(score) >= 0).collect(Collectors.toList());
+                } else {
+                    Double finalMax = max;
+                    qjstudents = studentList.stream().filter(s -> s.getStuscore().compareTo(score) >= 0 && s.getStuscore().compareTo(finalMax) < 0).collect(Collectors.toList());
+                }
+                dwscore = MarkingUtil.objToDouble(djvalue);
+                max = score;
+                minRank = qjstudents.stream().mapToInt(MsrStudent::getSchoolrank).summaryStatistics().getMin();
+            } else {//按比例
+                int index = (int) Math.ceil(MarkingUtil.div(totalnum * 100, djvalue));
+                if (index > totalnum) index = totalnum;
+                qjstudents = studentList.subList(minIndex, index);
+                minIndex = index;
+                DoubleSummaryStatistics statistics = qjstudents.stream().mapToDouble(MsrStudent::getStuscore).summaryStatistics();
+                dwscore = N_Utils.handleInfinity(statistics.getMin());
+                ljstudents = studentList.stream().filter(s -> s.getStuscore().compareTo(dwscore) >= 0).collect(Collectors.toList());
+            }
+            int qjnum = qjstudents.size();
+            MsrClassNearline nearline = new MsrClassNearline();
+            nearline.setExamid(examid);
+            nearline.setSubjectid(subjectid);
+            nearline.setClassid(classid);
+            Integer dworder = i + 1;
+            String dwname = N_Utils.NumberToChn(dworder) + "档";
+            nearline.setDwname(dwname);
+            nearline.setDworder(dworder);
+            nearline.setDwscore(dwscore);
+            nearline.setSxnum(qjnum);
+            nearline.setSxrate(N_Utils.getIntegerDivideAndMulitiply(qjnum, totalnum));
+            int ljsxnum = ljstudents.size();
+            nearline.setLjsxnum(ljsxnum);
+            nearline.setLjsxrate(N_Utils.getIntegerDivideAndMulitiply(ljsxnum, totalnum));
+            if (!"zf".equals(subjectid)) {
+                List<Integer> zfsxIds = zfSx.get(dworder);//总分上线学生id列表
+                int zfsxnum = zfsxIds.size();
+                List<MsrStudent> ssxIds = qjstudents.stream().filter(s -> zfsxIds.contains(s.getStudentid())).collect(Collectors.toList());
+                Integer ssxnum = ssxIds.size();//双上线人数
+                nearline.setSsxnum(ssxnum);
+                nearline.setStuids2(ssxIds.stream().map(s -> s.getStudentid().toString()).collect(Collectors.joining(",")));
+                //总分上线学科未上线人数
+                List<Integer> dksxIds = qjstudents.stream().map(MsrStudent::getStudentid).collect(Collectors.toList());
+                List<Integer> zfsxxkwsxIds = new ArrayList<>();
+                zfsxxkwsxIds.addAll(zfsxIds);
+                zfsxxkwsxIds.removeAll(dksxIds);
+                int zfsxxkwsxnum = zfsxxkwsxIds.size();
+                nearline.setZfsxxkwsxnum(zfsxxkwsxnum);
+                nearline.setStuids5(zfsxxkwsxIds.stream().map(s -> s.toString()).collect(Collectors.joining(",")));
+                nearline.setGxrate(N_Utils.getIntegerDivideAndMulitiply(qjnum, zfsxnum));
+                nearline.setMzxrate(N_Utils.getIntegerDivideAndMulitiply(ssxnum, qjnum));
+            }
+            nearline.setSxrate(N_Utils.getIntegerDivideAndMulitiply(qjnum, totalnum));
+            double ljMax = MarkingUtil.add(dwscore, fdMaxScore);
+            double ljMin = MarkingUtil.sub(dwscore, fdMinScore);
+            List<MsrStudent> ljStudents = studentList.stream().filter(s -> s.getStuscore().compareTo(ljMax) <= 0 && s.getStuscore().compareTo(ljMin) >= 0).collect(Collectors.toList());
+            nearline.setLjsnum(ljStudents.size());
+            nearline.setLjsavgscore(N_Utils.formatDouble(ljStudents.stream().mapToDouble(MsrStudent::getStuscore).summaryStatistics().getAverage(), 2));
+            nearline.setStuids3(ljStudents.stream().map(s -> s.getStudentid().toString()).collect(Collectors.joining(",")));
+            nearline.setStuids4(ljstudents.stream().map(s -> s.getStudentid().toString()).collect(Collectors.joining(",")));
+            String stuids = qjstudents.stream().map(s -> s.getStudentid().toString()).collect(Collectors.joining(","));
+            nearline.setStuids(stuids);
+            classNearlines.add(nearline);
+        }
+    }
+
+    //总分上线分析
+    private Map<Integer, List<Integer>> setZfsxMap(List<MsrStudent> studentList, Map<String, List<SzJsonVo>> qjMap
+            , Map<String, Integer> tMap) {
+        Map<Integer, List<Integer>> zfSx = new HashMap<>();
+        String subjectid = "zf";
+        int totalnum;
+        List<SzJsonVo> list = qjMap.get(subjectid);
+        Integer rptype = tMap.get(subjectid);
+        if (rptype.equals(3)) {
+            studentList = studentList.stream().sorted(Comparator.comparing(MsrStudent::getStuscore).reversed()).collect(Collectors.toList());
+        }
+        totalnum = studentList.size();//区间总人数
+        Double max = null;
+        Integer minRank = null;
+        int minIndex = 0;
+        for (int i = 0; i < list.size(); i++) {
+            SzJsonVo rg = list.get(i);
+            Object djvalue = rg.getDjvalue();
+            List<MsrStudent> qjstudents;//上线学生列表
+            if (rptype.equals(1)) {//按名次
+                Integer rank = N_Utils.obj2Int(djvalue);
+                if (minRank == null) {
+                    qjstudents = studentList.stream().filter(s -> s.getSchoolrank().compareTo(rank) <= 0).collect(Collectors.toList());
+                } else {
+                    Integer finalMinRank = minRank;
+                    qjstudents = studentList.stream().filter(s -> s.getSchoolrank().compareTo(finalMinRank) >= 0 && s.getSchoolrank().compareTo(rank) < 0).collect(Collectors.toList());
+                }
+                minRank = rank;
+            } else if (rptype.equals(2)) {//按分数
+                Double score = MarkingUtil.objToDouble(djvalue);
+                if (max == null) {
+                    qjstudents = studentList.stream().filter(s -> s.getStuscore().compareTo(score) >= 0).collect(Collectors.toList());
+                } else {
+                    Double finalMax = max;
+                    qjstudents = studentList.stream().filter(s -> s.getStuscore().compareTo(score) >= 0 && s.getStuscore().compareTo(finalMax) < 0).collect(Collectors.toList());
+                }
+                max = score;
+                minRank = qjstudents.stream().mapToInt(MsrStudent::getSchoolrank).summaryStatistics().getMin();
+            } else {//按比例
+                int index = (int) Math.ceil(MarkingUtil.div(totalnum * 100, djvalue));
+                if (index > totalnum) index = totalnum;
+                qjstudents = studentList.subList(minIndex, index);
+                minIndex = index;
+            }
+
+            Integer dworder = i + 1;
+            List<Integer> ids = qjstudents.stream().map(MsrStudent::getStudentid).collect(Collectors.toList());
+            zfSx.put(dworder, ids);
+        }
+        return zfSx;
+    }
+
     //分段统计
     public void saveClassSection(Integer examid, Integer type, String reportcode, List<MsrStudent> msrStudents) {
         List<MsrReportparam> params = getMsrReportParams(examid, "scoresection", reportcode);

smarking/src/main/resources/mapper/exam/MsSubjectMapper.xml

@@ -12,8 +12,8 @@
     <!--考试进度总览-->
     <select id="examOverview" resultType="java.util.Map">
         select s.msid,s.subjectid,s.subjectname,s.sdate,s.begintime,s.endtime,s.msstate,s.pstate,s.ptstate,
-        s.pbstate,s.checkset,s.checkstate,s.invigilatestate,p.answered,p.ptype,p.cutstate,s.teacherid,
-        u.username as teachername,p.mpid,p.yjstate,p.cutstate,e.exammode,e.examstate,e.hashb,e.gradeid,s.leaderid,u2.username as leadername
+        s.pbstate,s.checkset,s.checkstate,s.invigilatestate,p.answered,p.ptype,s.teacherid,
+        u.username as teachername,p.mpid,p.yjstate,e.exammode,e.examstate,e.hashb,e.gradeid,s.leaderid,u2.username as leadername
         ,if(ps.batchid is not null,ps.mpsid,null) scannum,count(ps.mpsid) stunum
         from ms_subject s left join t_user u on s.teacherid=u.userid
         left join t_user u2 on s.leaderid=u2.userid