题块批阅

名次和比例分析

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

@@ -37,4 +37,6 @@ public class MsrClassRankrate extends BaseBean {
     private Integer rnum;
     //占比
     private Double rrate;
+    //学生id字符串
+    private String stuids;
 }

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

@@ -506,20 +506,20 @@ public class MsPaperCheckTeacherTaskService {
                 //题块批阅信息
                 MsPaperStudentBlock block = new MsPaperStudentBlock();
                 block.setMpsbid(mpsbid);
-                String stuscores = questions.stream().map(MsPaperBlockQuestion::getMergescore).collect(Collectors.joining(";"));
-                String[] cores;
+                String stuscores = questions.stream().map(MsPaperBlockQuestion::getMergestuscore).collect(Collectors.joining(";"));
+                String[] cores = new String[0];
                 if (type.equals(1)) {
                     block.setFirstcid(handleid);
                     block.setFirstcime(N_Utils.getSecondTimestamp());
                     block.setFirstccore(arbitratescore);
                     block.setFirstccores(stuscores);
-                    cores = param.getSecondcscores().split(";");
+                    if (corrected) cores = result.getSecondcscores().split(";");
                 } else {
                     block.setSecondcid(handleid);
                     block.setSecondctime(N_Utils.getSecondTimestamp());
                     block.setSecondcscore(arbitratescore);
                     block.setSecondcscores(stuscores);
-                    cores = param.getFirstccores().split(";");
+                    if (corrected) cores = result.getFirstccores().split(";");
                 }
                 List<MsPaperStudentQuestion> studentQuestions = new ArrayList<>();
                 for (int j = 0; j < questions.size(); j++) {
@@ -555,16 +555,11 @@ public class MsPaperCheckTeacherTaskService {
                         String[] mergescores = question.getMergescore().split(",");
                         String[] mergestuscore = question.getMergestuscore().split(",");
                         double[] scores = new double[mergestuscore.length];
-                        int last = mergestuscore.length - 1;
-                        double score = 0;
                         for (int i = 0; i < mergestuscore.length; i++) {
-                            scores[i] = MarkingUtil.mul(MarkingUtil.div(mergestuscore[i], qscore), stuscore);
-                            score = MarkingUtil.add(score, scores[i]);
-                            if (i == last) {
-                                scores[i] = MarkingUtil.sub(stuscore, score);
-                            }
+                            scores[i]=MarkingUtil.objToDouble(mergestuscore[i]);
                         }
-                        String[] cores2 = cores[j].split(",");
+                        String[] cores2 = new String[0];
+                        if (corrected) cores2 = cores[j].split(",");
                         for (int i = 0; i < mptqids.length; i++) {
                             MsPaperStudentQuestion studentQuestion = new MsPaperStudentQuestion();
                             studentQuestion.setMptqid(N_Utils.obj2Int(mptqids[i]));

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

@@ -60,6 +60,10 @@ public class MsrExamService {
     private MsrClassTopMapper msrClassTopMapper;
     @Resource
     private MsrClassSubjectGradeMapper msrClassSubjectGradeMapper;
+    @Resource
+    private MsrClassRankgroupMapper msrClassRankgroupMapper;
+    @Resource
+    private MsrClassRankrateMapper msrClassRankrateMapper;
 
 
     /**
@@ -345,15 +349,141 @@ public class MsrExamService {
         msrClassSubjectMapper.insertList(msrClassSubjects);
         msrClassTopMapper.insertList(msrClassTops);
 
-        saveClassSubjectGrade(examid, "scorerate", "zh", msrStudents);//综合报告-班级学科四率等级分析
-        saveClassSubjectGrade(examid, "scorerate", "xj", msrStudents);//校级报告-班级学科四率等级分析
+        saveClassSubjectGrade(examid, "zh", msrStudents);//综合报告-班级学科四率等级分析
+        saveClassSubjectGrade(examid, "xj", msrStudents);//校级报告-班级学科四率等级分析
+        saveClassRankGroup(examid, msrStudents);//学科报告-班级学科名次分组分析
+        saveClassRankRate(examid, msrStudents);//综合报表-名次和比例分析
 
         examMapper.updateExamState(examid, 3);
     }
 
+    //学科报告-班级学科名次分组分析
+    private void saveClassRankGroup(Integer examid, List<MsrStudent> msrStudents) {
+        List<MsrClassRankgroup> classRankGroups = new ArrayList<>();
+        int groupNum = 10;
+        String subjectid;
+        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<MsrStudent> studentList = entry.getValue();
+            int maxRank = studentList.stream().mapToInt(MsrStudent::getSchoolrank).summaryStatistics().getMax();
+            List<RankGroupVo> groups = MarkingUtil.rankGroup(maxRank, groupNum);
+            for (RankGroupVo group : groups) {
+                int maxvalue = group.getMaxvalue();
+                int minvalue = group.getMinvalue();
+                List<MsrStudent> qjstudents = studentList.stream().filter(s -> s.getSchoolrank().compareTo(minvalue) >= 0 && s.getSchoolrank().compareTo(maxvalue) <= 0).collect(Collectors.toList());
+                MsrClassRankgroup cg = new MsrClassRankgroup();
+                cg.setExamid(examid);
+                cg.setClassid(classid);
+                cg.setSubjectid(subjectid);
+                cg.setRname(group.getGroupname());
+                cg.setRnum(qjstudents.size());
+                String stuids = qjstudents.stream().map(s -> s.getStudentid().toString()).collect(Collectors.joining(","));
+                cg.setStuids(stuids);
+                classRankGroups.add(cg);
+            }
+        }
+        msrClassRankgroupMapper.insertList(classRankGroups);
+    }
+
+    //综合报表-名次和比例分析
+    private void saveClassRankRate(Integer examid, List<MsrStudent> msrStudents) {
+        List<MsrReportparam> params = getMsrReportParams(examid, "rankrate", "zh");
+        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());
+        }
+        List<MsrClassRankrate> classRankrates = 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;
+            Object minRate = null;
+            for (SzJsonVo rg : list) {
+                Object djvalue = rg.getDjvalue();
+                List<MsrStudent> qjstudents;
+                String ztname;
+                String ctname;
+                if (rptype.equals(1)) {//按名次
+                    ztname = "前" + djvalue + "名";
+                    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;
+                    double minScore = N_Utils.handleInfinity(qjstudents.stream().mapToDouble(MsrStudent::getStuscore).summaryStatistics().getMin());
+                    ctname = ">=" + minScore + "分";
+                } else if (rptype.equals(2)) {//按分数
+                    ztname = ">=" + djvalue + "分";
+                    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();
+                    ctname = "前" + minRank + "名";
+                } else {//按比例
+                    if (minIndex == 0) {
+                        ztname = "前" + djvalue + "%";
+                    } else {
+                        ztname = "前" + minRate + "%-" + djvalue + "%";
+                    }
+                    int index = (int) Math.ceil(MarkingUtil.div(totalnum * 100, djvalue));
+                    if (index > totalnum) index = totalnum;
+                    qjstudents = studentList.subList(minIndex, index);
+                    minIndex = index;
+                    minRate = djvalue;
+                    DoubleSummaryStatistics statistics = qjstudents.stream().mapToDouble(MsrStudent::getStuscore).summaryStatistics();
+                    double minScore = N_Utils.handleInfinity(statistics.getMin());
+                    double maxScore = N_Utils.handleInfinity(statistics.getMax());
+                    ctname = "[" + minScore + "-" + maxScore + "]";
+                }
+                int qjnum = qjstudents.size();
+                MsrClassRankrate rankrate = new MsrClassRankrate();
+                rankrate.setExamid(examid);
+                rankrate.setSubjectid(subjectid);
+                rankrate.setClassid(classid);
+                rankrate.setStunum(totalnum);
+                rankrate.setRtype(rptype);
+                rankrate.setZtname(ztname);
+                rankrate.setCtname(ctname);
+                rankrate.setRnum(qjnum);
+                rankrate.setRrate(N_Utils.getIntegerDivideAndMulitiply(qjnum, totalnum));
+                String stuids = qjstudents.stream().map(s -> s.getStudentid().toString()).collect(Collectors.joining(","));
+                rankrate.setStuids(stuids);
+                classRankrates.add(rankrate);
+            }
+        }
+        msrClassRankrateMapper.insertList(classRankrates);
+    }
+
     //班级学科四率等级分析
-    private void saveClassSubjectGrade(Integer examid, String rpbelong, String reportcode, List<MsrStudent> msrStudents) {
-        Map<String, List<SzJsonVo>> qjMap = getReportParams(examid, rpbelong, reportcode);
+    private void saveClassSubjectGrade(Integer examid, String reportcode, List<MsrStudent> msrStudents) {
+        Map<String, List<SzJsonVo>> qjMap = getReportParams(examid, "scorerate", reportcode);
         List<MsrClassSubjectGrade> msrClassSubjectGrades = new ArrayList<>();//班级学科分析
         String subjectid;
         int totalnum;
@@ -367,13 +497,10 @@ public class MsrExamService {
             List<MsrStudent> studentList = entry.getValue();
             totalnum = studentList.size();//区间总人数
             Double fullscore1 = studentList.get(0).getFullscore();
-            List<RankGroupVo> fdScore = MarkingUtil.fdScore(fullscore1, N_Utils.obj2Int(list.get(0).getDjvalue()));
-            for (RankGroupVo rg : fdScore) {
-                int minscore = rg.getMinvalue();
-                int maxscore = rg.getMaxvalue();
-                String qjname = rg.getGroupname();
-                double min = MarkingUtil.objToDouble(minscore);
-                double max = MarkingUtil.objToDouble(maxscore);
+            for (SzJsonVo rg : list) {
+                String qjname = rg.getDjkey();
+                double min = MarkingUtil.mul(rg.getMinvalue(), fullscore1);
+                double max = MarkingUtil.mul(rg.getMaxvalue(), fullscore1);
                 List<MsrStudent> qjstudents;
                 if (fullscore1.compareTo(max) == 0) {
                     qjstudents = studentList.stream().filter(s -> s.getStuscore().compareTo(min) >= 0).collect(Collectors.toList());
@@ -389,8 +516,9 @@ public class MsrExamService {
                 classSubjectGrade.setRange(qjname);
                 classSubjectGrade.setRangenum(qjnum);
                 classSubjectGrade.setRangerate(N_Utils.getIntegerDivideAndMulitiply(qjnum, totalnum));
-                //double qjavg = qjstudents.stream().mapToDouble(MsrStudent::getStuscore).summaryStatistics().getAverage();
-                //classSubjectGrade.setQjavgrate(N_Utils.getDoubleDivideAndMulitiply(qjavg, fullscore1));
+                double qjavg = qjstudents.stream().mapToDouble(MsrStudent::getStuscore).summaryStatistics().getAverage();
+                classSubjectGrade.setDjscore(qjavg);
+                classSubjectGrade.setDjrate(N_Utils.getDoubleDivideAndMulitiply(qjavg, fullscore1));
                 String stuids = qjstudents.stream().map(s -> s.getStudentid().toString()).collect(Collectors.joining(","));
                 classSubjectGrade.setStuids(stuids);
                 msrClassSubjectGrades.add(classSubjectGrade);
@@ -408,10 +536,12 @@ public class MsrExamService {
 
     //获取报告参数
     private Map<String, List<SzJsonVo>> getReportParams(Integer examid, String rpbelong, String reportcode) {
-        List<MsrReportparam> list = msrReportparamMapper.listReportparamByRpbelong(examid, rpbelong, reportcode);
-        if (N_Utils.isListEmpty(list)) {
-            list = msrReportparamMapper.listReportparamByRpbelong(examid, rpbelong, "all");
-        }
+        List<MsrReportparam> list = getMsrReportParams(examid, rpbelong, reportcode);
+        return formatSzJson(list);
+    }
+
+    //格式化报告参数
+    private Map<String, List<SzJsonVo>> formatSzJson(List<MsrReportparam> list) {
         Map<String, List<SzJsonVo>> qjMap = new HashMap<>();
         for (MsrReportparam param : list) {
             qjMap.put(param.getSubjectid(), JSON.parseArray(param.getSzjson(), SzJsonVo.class));
@@ -419,6 +549,15 @@ public class MsrExamService {
         return qjMap;
     }
 
+    //获取报告参数
+    private List<MsrReportparam> getMsrReportParams(Integer examid, String rpbelong, String reportcode) {
+        List<MsrReportparam> list = msrReportparamMapper.listReportparamByRpbelong(examid, rpbelong, reportcode);
+        if (N_Utils.isListEmpty(list)) {
+            list = msrReportparamMapper.listReportparamByRpbelong(examid, rpbelong, "all");
+        }
+        return list;
+    }
+
     //设置科目分析计算参数
     private void setSubject(MsrSubject msrSubject, List<MsrStudent> schoolStudents2) {
         Double avgscore = msrSubject.getAvgscore();

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

@@ -542,6 +542,7 @@ public class MarkingUtil {
     //排名分组计算 参数[总名次，分组数] 如：第一组(第1-10名)
     public static List<RankGroupVo> rankGroup(Integer total,Integer groupNum) {
         List<RankGroupVo> rtnList = new ArrayList<>();
+        if (groupNum > total) groupNum = total;
 
         int average = total / groupNum;
         int remainder = total % groupNum;
@@ -558,7 +559,7 @@ public class MarkingUtil {
             }
 
             RankGroupVo rgvo = new RankGroupVo();
-            rgvo.setGroupname("第" + (i + 1) + "组(" + min + "~" + max + ")");
+            rgvo.setGroupname("第" + N_Utils.NumberToChn(i + 1) + "组(" + min + "~" + max + ")");
             rgvo.setMinvalue(min);
             rgvo.setMaxvalue(max);
             rtnList.add(rgvo);

smarking/src/main/resources/mapper/papercheck/MsPaperCheckTeacherTaskMapper.xml

@@ -743,6 +743,7 @@
         select psq.firstcid,psq.firstcime,psq.firstccore,psq.secondcid,psq.secondctime,psq.secondcscore
         ,psq.mpsid
         <if test="param.correcttype==3">
+            ,psq.firstccores,psq.secondcscores
             from ms_paper_student_block psq
             where psq.mpsbid=#{param.mpsbid}
         </if>