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

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

@@ -39,8 +39,6 @@ public class MsrClassNearline extends BaseBean {
     private Integer ljsxnum;
     //累计上线率
     private Double ljsxrate;
-    //单科上线人数
-    private Integer dksxnum;
     //双上线人数
     private Integer ssxnum;
     //总分上线学科未上线人数
@@ -53,4 +51,10 @@ public class MsrClassNearline extends BaseBean {
     private Integer ljsnum;
     //临界生平均分
     private Double ljsavgscore;
+    //单上线学生id字符串
+    private String stuids;
+    //双上线学生id字符串
+    private String stuids2;
+    //临界生id字符串
+    private String stuids3;
 }

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

@@ -67,6 +67,8 @@ public class MsrExamService {
     private MsrClassRankrateMapper msrClassRankrateMapper;
     @Resource
     private MsrClassSectionMapper msrClassSectionMapper;
+    @Resource
+    private MsrClassNearlineMapper msrClassNearlineMapper;
 
 
     /**
@@ -367,10 +369,146 @@ public class MsrExamService {
         saveClassSection(examid, 1, "xk", msrStudents);//学科报告-分段统计
         saveClassSection(examid, 1, "bj", msrStudents);//班级报告-分段统计
         saveClassSection(examid, 1, "jxzl", msrStudents);//教学质量-分段统计
+        saveClassNearLine(examid, msrStudents);//分档上线统计
 
         examMapper.updateExamState(examid, 3);
     }
 
+    //分档上线分析
+    public void saveClassNearLine(Integer examid, List<MsrStudent> msrStudents) {
+        List<MsrReportparam> params = getMsrReportParams(examid, "gradescore", "all");
+        Map<String, List<SzJsonVo>> qjMap = new HashMap<>();
+        Map<String, Integer> tMap = new HashMap<>();
+        for (MsrReportparam param : params) {
+            String subjectid = param.getSubjectid();
+            qjMap.put(subjectid, JSON.parseArray(param.getSzjson(), SzJsonVo.class));
+            tMap.put(subjectid, param.getRptype());
+        }
+        params = getMsrReportParams(examid, "nearline", "all");
+        List<SzJsonVo> vos = JSON.parseArray(params.get(0).getSzjson(), SzJsonVo.class);
+        Map<Integer, List<Integer>> zfSx = new HashMap<>();//学生总分是否上线
+        List<MsrClassNearline> classNearlines = new ArrayList<>();
+        String subjectid;
+        int totalnum;
+        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);
+            }
+        }
+        Map<String, List<MsrClassNearline>> collect = classNearlines.stream().collect(Collectors.groupingBy(l -> l.getSubjectid() + "_" + l.getDworder()));
+        for (Map.Entry<String, List<MsrClassNearline>> entry : collect.entrySet()) {
+            List<MsrClassNearline> nearlineList = entry.getValue();
+            List<Integer> nums = new ArrayList<>();
+            for (MsrClassNearline nearline : nearlineList) {
+                nums.add(nearline.getSxnum());
+            }
+            Map<Integer, Integer> rspm = MarkingUtil.rspm(nums);//人数排名
+            for (MsrClassNearline nearline : nearlineList) {
+                nearline.setSxrank(rspm.get(nearline.getSxnum()));
+            }
+        }
+        msrClassNearlineMapper.insertList(classNearlines);
+    }
+
     //分段统计
     public void saveClassSection(Integer examid, Integer type, String reportcode, List<MsrStudent> msrStudents) {
         List<MsrReportparam> params = getMsrReportParams(examid, "scoresection", reportcode);
@@ -564,7 +702,6 @@ public class MsrExamService {
         String subjectid;
         int totalnum;
         Map<String, List<MsrStudent>> scCollect = msrStudents.stream().collect(Collectors.groupingBy(s -> s.getClassid() + "_" + s.getSubjectid()));
-        List<Integer> nums = new ArrayList<>();
         for (Map.Entry<String, List<MsrStudent>> entry : scCollect.entrySet()) {
             String key = entry.getKey();
             Integer classid = N_Utils.obj2Int(key.split("_")[0]);
@@ -598,14 +735,19 @@ public class MsrExamService {
                 String stuids = qjstudents.stream().map(s -> s.getStudentid().toString()).collect(Collectors.joining(","));
                 classSubjectGrade.setStuids(stuids);
                 msrClassSubjectGrades.add(classSubjectGrade);
-                nums.add(qjnum);
             }
         }
-        Map<Integer, Integer> rspm = MarkingUtil.rspm(nums);//人数排名
-        for (MsrClassSubjectGrade classSubjectGrade : msrClassSubjectGrades) {
-            int rangenum = classSubjectGrade.getRangenum();
-            int rank = rspm.get(rangenum);
-            classSubjectGrade.setRangenumrank(rank);
+        Map<String, List<MsrClassSubjectGrade>> collect = msrClassSubjectGrades.stream().collect(Collectors.groupingBy(g -> g.getSubjectid() + "_" + g.getRangename()));
+        for (Map.Entry<String, List<MsrClassSubjectGrade>> entry : collect.entrySet()) {
+            List<MsrClassSubjectGrade> nearlineList = entry.getValue();
+            List<Integer> nums = new ArrayList<>();
+            for (MsrClassSubjectGrade classSubjectGrade : nearlineList) {
+                nums.add(classSubjectGrade.getRangenum());
+            }
+            Map<Integer, Integer> rspm = MarkingUtil.rspm(nums);//人数排名
+            for (MsrClassSubjectGrade classSubjectGrade : nearlineList) {
+                classSubjectGrade.setRangenumrank(rspm.get(classSubjectGrade.getRangenum()));
+            }
         }
         msrClassSubjectGradeMapper.insertList(msrClassSubjectGrades);
     }

smarking/src/main/java/com/xhkjedu/smarking/utils/MarkingUtil.java

@@ -132,6 +132,8 @@ public class MarkingUtil {
      * @return 两个参数的和
      */
     public static double add(Object v1, Object v2) {
+        if (v1 == null) v1 = 0;
+        if (v2 == null) v2 = 0;
         BigDecimal b1 = new BigDecimal(v1.toString());
         BigDecimal b2 = new BigDecimal(v2.toString());
         return b1.add(b2).doubleValue();