分段统计

scommons/src/main/java/com/xhkjedu/utils/N_Utils.java

@@ -160,9 +160,14 @@ public class N_Utils {
      * @Param [str]
      * @Return java.lang.Integer
      **/
-    public static Integer obj2Int(Object str){
-        if (isNotEmpty(str)){
-            return Integer.parseInt(str.toString());
+    public static Integer obj2Int(Object str) {
+        if (isNotEmpty(str)) {
+            String num = str.toString();
+            if (num.contains(".")) {
+                return Integer.parseInt(num.split("\\.")[0]);
+            } else {
+                return Integer.parseInt(num);
+            }
         } else {
             return 0;
         }

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

@@ -23,8 +23,6 @@ public class MsrClassRankrate extends BaseBean {
     private String subjectid;
     //班级ID（含全体）
     private Integer classid;
-    //班级名称
-    private String classname;
     //参考人数
     private Integer stunum;
     //类型（1名次 2分数 3比例）

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

@@ -27,12 +27,14 @@ public class MsrClassSection extends BaseBean {
     private Integer stunum;
     //分段类型（1分段统计 2累计统计）
     private Integer type;
-    //分数区间
-    private String sfqj;
+    //归属报告模块编码
+    private String reportcode;
     //分值范围
     private String fzfw;
     //分值范围人数
     private Integer fzfwnum;
     //分值范围人数比例
     private Double fzfwrate;
+    //学生id字符串
+    private String stuids;
 }

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

@@ -26,7 +26,7 @@ public class MsrClassSubjectGrade extends BaseBean {
     //归属报告模块编码：zh综合报告 xj校级报告 xk学科报告 bj班级报告 xs学生报告 mtzl命题质量报告 jxzl教学质量报告 xksy学科素养报告
     private String reportcode;
     //四率/等级
-    private String range;
+    private String rangename;
     //四率对应人数
     private Integer rangenum;
     //四率对应人数排名

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

@@ -22,6 +22,7 @@ import com.xhkjedu.smarking.vo.report.reportclass.ClassTopVo;
 import com.xhkjedu.smarking.vo.report.reportother.*;
 import com.xhkjedu.utils.N_Utils;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
 import java.util.*;
@@ -64,6 +65,8 @@ public class MsrExamService {
     private MsrClassRankgroupMapper msrClassRankgroupMapper;
     @Resource
     private MsrClassRankrateMapper msrClassRankrateMapper;
+    @Resource
+    private MsrClassSectionMapper msrClassSectionMapper;
 
 
     /**
@@ -73,6 +76,7 @@ public class MsrExamService {
      * @Param [examid]
      * @Return void
      **/
+    @Transactional(rollbackFor = Exception.class)
     public void generateExamReport(Integer examid) {
         MsExam exam = examMapper.selectByPrimaryKey(examid);
         Integer exammode = exam.getExammode();
@@ -263,7 +267,11 @@ public class MsrExamService {
 
         //科目班级分数分布区间分析、班级学科分析
         //区间参数
-        Map<String, List<SzJsonVo>> qjMap = getReportParams(examid, "scoresection", "xk");
+        Map<String, SzJsonVo> qjMap = new HashMap<>();
+        List<MsrReportparam> params = getMsrReportParams(examid, "scoresection", "xk");
+        for (MsrReportparam param : params) {
+            qjMap.put(param.getSubjectid(), JSON.parseObject(param.getSzjson(), SzJsonVo.class));
+        }
         List<MsrSubjectClass> msrSubjectClasses = new ArrayList<>();//科目班级分数分布区间分析
         List<MsrClassSubject> msrClassSubjects = new ArrayList<>();//班级学科分析
         List<MsrClassTop> msrClassTops = new ArrayList<>();//班级学科前60分析
@@ -287,11 +295,11 @@ public class MsrExamService {
             String key = entry.getKey();
             Integer classid = N_Utils.obj2Int(key.split("_")[0]);
             subjectid = key.split("_")[1];
-            List<SzJsonVo> list = qjMap.get(subjectid);
+            SzJsonVo vo = qjMap.get(subjectid);
             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()));
+            List<RankGroupVo> fdScore = MarkingUtil.fdScore(fullscore1, N_Utils.obj2Int(vo.getDjvalue()));
             for (RankGroupVo rg : fdScore) {
                 int minscore = rg.getMinvalue();
                 int maxscore = rg.getMaxvalue();
@@ -353,12 +361,80 @@ public class MsrExamService {
         saveClassSubjectGrade(examid, "xj", msrStudents);//校级报告-班级学科四率等级分析
         saveClassRankGroup(examid, msrStudents);//学科报告-班级学科名次分组分析
         saveClassRankRate(examid, msrStudents);//综合报表-名次和比例分析
+        saveClassSection(examid, 1, "zh", msrStudents);//综合报表-分段统计
+        saveClassSection(examid, 2, "zh", msrStudents);//综合报表-累计统计
+        saveClassSection(examid, 1, "xj", msrStudents);//校级报告-分段统计
+        saveClassSection(examid, 1, "xk", msrStudents);//学科报告-分段统计
+        saveClassSection(examid, 1, "bj", msrStudents);//班级报告-分段统计
+        saveClassSection(examid, 1, "jxzl", msrStudents);//教学质量-分段统计
 
         examMapper.updateExamState(examid, 3);
     }
 
+    //分段统计
+    public void saveClassSection(Integer examid, Integer type, String reportcode, List<MsrStudent> msrStudents) {
+        List<MsrReportparam> params = getMsrReportParams(examid, "scoresection", reportcode);
+        Integer rptype = params.get(0).getRptype();
+        Map<String, List<RankGroupVo>> fdMap = new HashMap<>();
+        if (rptype.equals(0)) {//固定步长
+            for (MsrReportparam param : params) {
+                SzJsonVo vo = JSON.parseObject(param.getSzjson(), SzJsonVo.class);
+                List<RankGroupVo> groups = MarkingUtil.fdScore(N_Utils.obj2Int(vo.getMaxvalue()), N_Utils.obj2Int(vo.getMinvalue()), N_Utils.obj2Int(vo.getDjvalue()), type);
+                fdMap.put(param.getSubjectid(), groups);
+            }
+        } else {//不定步长
+            for (MsrReportparam param : params) {
+                List<SzJsonVo> vos = JSON.parseArray(param.getSzjson(), SzJsonVo.class);
+                List<RankGroupVo> groups = MarkingUtil.fdScore(vos, type);
+                fdMap.put(param.getSubjectid(), groups);
+            }
+        }
+
+        List<MsrClassSection> classSections = new ArrayList<>();
+        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();
+            Integer stunum = studentList.size();
+            List<RankGroupVo> groups = fdMap.get(subjectid);
+            for (int i = 0; i < groups.size(); i++) {
+                RankGroupVo group = groups.get(i);
+                int maxvalue = group.getMaxvalue();
+                int minvalue = group.getMinvalue();
+                List<MsrStudent> qjstudents;
+                if (type.equals(1)) {
+                    if (i == 0) {
+                        qjstudents = studentList.stream().filter(s -> MarkingUtil.sub(s.getStuscore(), minvalue) >= 0 && MarkingUtil.sub(s.getStuscore(), maxvalue) <= 0).collect(Collectors.toList());
+                    } else {
+                        qjstudents = studentList.stream().filter(s -> MarkingUtil.sub(s.getStuscore(), minvalue) >= 0 && MarkingUtil.sub(s.getStuscore(), maxvalue) < 0).collect(Collectors.toList());
+                    }
+                } else {
+                    qjstudents = studentList.stream().filter(s -> MarkingUtil.sub(s.getStuscore(), maxvalue) >= 0).collect(Collectors.toList());
+                }
+                MsrClassSection classSection = new MsrClassSection();
+                classSection.setExamid(examid);
+                classSection.setClassid(classid);
+                classSection.setSubjectid(subjectid);
+                classSection.setStunum(stunum);
+                classSection.setType(type);
+                classSection.setReportcode(reportcode);
+                classSection.setFzfw(group.getGroupname());
+                int qjnum = qjstudents.size();
+                classSection.setFzfwnum(qjnum);
+                classSection.setFzfwrate(N_Utils.getIntegerDivideAndMulitiply(qjnum, stunum));
+                String stuids = qjstudents.stream().map(s -> s.getStudentid().toString()).collect(Collectors.joining(","));
+                classSection.setStuids(stuids);
+                classSections.add(classSection);
+            }
+        }
+        msrClassSectionMapper.insertList(classSections);
+    }
+
     //学科报告-班级学科名次分组分析
-    private void saveClassRankGroup(Integer examid, List<MsrStudent> msrStudents) {
+    public void saveClassRankGroup(Integer examid, List<MsrStudent> msrStudents) {
         List<MsrClassRankgroup> classRankGroups = new ArrayList<>();
         int groupNum = 10;
         String subjectid;
@@ -389,7 +465,7 @@ public class MsrExamService {
     }
 
     //综合报表-名次和比例分析
-    private void saveClassRankRate(Integer examid, List<MsrStudent> msrStudents) {
+    public 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<>();
@@ -482,7 +558,7 @@ public class MsrExamService {
     }
 
     //班级学科四率等级分析
-    private void saveClassSubjectGrade(Integer examid, String reportcode, List<MsrStudent> msrStudents) {
+    public 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;
@@ -513,11 +589,11 @@ public class MsrExamService {
                 classSubjectGrade.setSubjectid(subjectid);
                 classSubjectGrade.setClassid(classid);
                 classSubjectGrade.setReportcode(reportcode);
-                classSubjectGrade.setRange(qjname);
+                classSubjectGrade.setRangename(qjname);
                 classSubjectGrade.setRangenum(qjnum);
                 classSubjectGrade.setRangerate(N_Utils.getIntegerDivideAndMulitiply(qjnum, totalnum));
                 double qjavg = qjstudents.stream().mapToDouble(MsrStudent::getStuscore).summaryStatistics().getAverage();
-                classSubjectGrade.setDjscore(qjavg);
+                classSubjectGrade.setDjscore(N_Utils.formatDouble(qjavg, 2));
                 classSubjectGrade.setDjrate(N_Utils.getDoubleDivideAndMulitiply(qjavg, fullscore1));
                 String stuids = qjstudents.stream().map(s -> s.getStudentid().toString()).collect(Collectors.joining(","));
                 classSubjectGrade.setStuids(stuids);
@@ -604,12 +680,14 @@ public class MsrExamService {
         student.setCjl(MarkingUtil.cjl(student.getStuscore(), pjf));
         student.setClassrank(classrank);
         student.setSchoolrank(schoolrank);
-        double rankrate = MarkingUtil.div(schoolrank, msrSubject.getTotalnum());
+        Integer totalnum = msrSubject.getTotalnum();
+        double rankrate = MarkingUtil.div(schoolrank, totalnum);
         student.setRankrate(rankrate);//个人成绩排名率=自己所在学科成绩分数的名次/总人数
         student.setXkqrz(MarkingUtil.sub(msrSubject.getAvgrank(), rankrate));//学科强弱值 = 平均成绩排名率- 个人成绩排名率
         double dfv = N_Utils.getDoubleDivideAndMulitiply(student.getStuscore(), msrSubject.getFullscore());
         student.setGradevalue(MarkingUtil.dj(dfv, djList));
-        student.setHighschool(N_Utils.getIntegerDivideAndMulitiply(schoolrank, schoolRankVo.getNum2()));
+        int num = totalnum - schoolRankVo.getNum() - schoolRankVo.getNum2();
+        student.setHighschool(N_Utils.getIntegerDivideAndMulitiply(num, totalnum));
     }
 
     //分数排名

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

@@ -609,6 +609,62 @@ public class MarkingUtil {
         return scoreCountMap;
     }
 
+    // 分数段 分数分段（固定步长）
+    public static List<RankGroupVo> fdScore(Integer maxScore, Integer minScore, int fdscore, Integer type) {
+        List<RankGroupVo> rtnList = new ArrayList<>();
+        for (int i = minScore; i < maxScore; i += fdscore) {
+            int end = Math.min(i + fdscore, maxScore);
+
+            String groupname;
+            if (type.equals(1)) {
+
+                groupname = "[" + i + "~" + end;
+                if (end == maxScore) {
+                    groupname += "]";
+                } else {
+                    groupname += ")";
+                }
+            } else {
+                groupname = ">=" + end;
+            }
+
+            RankGroupVo rgvo = new RankGroupVo();
+            rgvo.setGroupname(groupname);
+            rgvo.setMinvalue(i);
+            rgvo.setMaxvalue(end);
+            rtnList.add(rgvo);
+        }
+        return rtnList;
+    }
+
+    // 分数段 分数分段（不定步长）
+    public static List<RankGroupVo> fdScore(List<SzJsonVo> vos, Integer type) {
+        List<RankGroupVo> rtnList = new ArrayList<>();
+        for (int i = 0; i < vos.size(); i++) {
+            SzJsonVo vo = vos.get(i);
+            Integer minvalue = N_Utils.obj2Int(vo.getMinvalue());
+            Integer maxvalue = N_Utils.obj2Int(vo.getMaxvalue());
+            String groupname;
+            if (type.equals(1)) {
+                groupname = "[" + minvalue + "~" + maxvalue;
+                if (i == 0) {
+                    groupname += "]";
+                } else {
+                    groupname += ")";
+                }
+            } else {
+                groupname = ">=" + maxvalue;
+            }
+
+            RankGroupVo rgvo = new RankGroupVo();
+            rgvo.setGroupname(groupname);
+            rgvo.setMinvalue(minvalue);
+            rgvo.setMaxvalue(maxvalue);
+            rtnList.add(rgvo);
+        }
+        return rtnList;
+    }
+
     // 分数段 分数分段
     public static List<RankGroupVo> fdScore(Double totalScore,int fdscore){
         List<RankGroupVo> rtnList = new ArrayList<>();