工具类，题型分析

smarking/src/main/java/com/xhkjedu/smarking/mapper/report/reportclass/MsrClassQuestionRankgroupMapper.java

@@ -1,12 +0,0 @@
-package com.xhkjedu.smarking.mapper.report.reportclass;
-
-import com.xhkjedu.base.TkMapper;
-import com.xhkjedu.smarking.model.report.reportclass.MsrClassQuestionRankgroup;
-
-/**
- * @Description 阅卷报告-试题小题排名分组分析表 Mapper 接口
- * @Author auto
- * @Date 2024-12-09
- */
-public interface MsrClassQuestionRankgroupMapper extends TkMapper<MsrClassQuestionRankgroup> {
-}

smarking/src/main/java/com/xhkjedu/smarking/mapper/report/reportsubject/MsrSubjectQuestionRankgroupMapper.java

@@ -0,0 +1,12 @@
+package com.xhkjedu.smarking.mapper.report.reportsubject;
+
+import com.xhkjedu.base.TkMapper;
+import com.xhkjedu.smarking.model.report.reportsubject.MsrSubjectQuestionRankgroup;
+
+/**
+ * @Description 阅卷报告-试题小题排名分组分析表 Mapper 接口
+ * @Author auto
+ * @Date 2024-12-09
+ */
+public interface MsrSubjectQuestionRankgroupMapper extends TkMapper<MsrSubjectQuestionRankgroup> {
+}

smarking/src/main/java/com/xhkjedu/smarking/mapper/report/reportsubject/MsrSubjectSectionQuestionMapper.java → smarking/src/main/java/com/xhkjedu/smarking/mapper/report/reportsubject/MsrSubjectQuestionSectionMapper.java

@@ -1,12 +1,12 @@
 package com.xhkjedu.smarking.mapper.report.reportsubject;
 
 import com.xhkjedu.base.TkMapper;
-import com.xhkjedu.smarking.model.report.reportsubject.MsrSubjectSectionQuestion;
+import com.xhkjedu.smarking.model.report.reportsubject.MsrSubjectQuestionSection;
 
 /**
  * @Description 阅卷报告-科目区间试题得分率表 Mapper 接口
  * @Author auto
  * @Date 2024-12-12
  */
-public interface MsrSubjectSectionQuestionMapper extends TkMapper<MsrSubjectSectionQuestion> {
+public interface MsrSubjectQuestionSectionMapper extends TkMapper<MsrSubjectQuestionSection> {
 }

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

@@ -25,6 +25,8 @@ public class MsrClassQtype extends BaseBean {
     private Integer classid;
     //题型ID
     private Integer mptid;
+    //题型题号
+    private String mptqn;
     //平均分
     private Double avgscore;
     //标准差

smarking/src/main/java/com/xhkjedu/smarking/model/report/reportclass/MsrClassQuestionRankgroup.java → smarking/src/main/java/com/xhkjedu/smarking/model/report/reportsubject/MsrSubjectQuestionRankgroup.java

@@ -1,4 +1,4 @@
-package com.xhkjedu.smarking.model.report.reportclass;
+package com.xhkjedu.smarking.model.report.reportsubject;
 
 import com.xhkjedu.model.BaseBean;
 import lombok.Data;
@@ -7,36 +7,36 @@ import javax.persistence.Id;
 import javax.persistence.Table;
 
 /**
- * @Description 阅卷报告-试题小题排名分组分析表
+ * @Description 阅卷报告-科目下试题排名分组分析
  * @Author auto
  * @Date 2024-12-09
  */
 @Data
-@Table(name = "msr_class_question_rankgroup")
-public class MsrClassQuestionRankgroup extends BaseBean {
+@Table(name = "msr_subject_question_rankgroup")
+public class MsrSubjectQuestionRankgroup extends BaseBean {
     @Id
-    //阅卷报告-试题小题排名分组分析
-    private Integer cqrgid;
+    //阅卷报告-科目下试题排名分组分析
+    private Integer sqrgid;
     //考试ID
     private Integer examid;
     //科目ID
     private String subjectid;
+    //类型1小题2客观题3主观题
+    private Integer qntype;
     //试题ID
     private Integer mptqid;
-    //试题题号类型1小题题号2客观题3主观题
-    private Integer qntype;
     //分数值
     private Double rgscore;
     //组别和名次 第1组(1~70名)
     private String rgroup;
     //类型1客观题 选项 2主观题 分值
     private Integer rgtype;
-    //分值范围/选项
+    //分值范围/选项：为空代表该组情况
     private String rgvalue;
     //人数
     private Integer stunum;
     //人数ids
     private String stuids;
-    //占比
-    private Double rgrate;
+    //得分率
+    private Double scorerate;
 }

smarking/src/main/java/com/xhkjedu/smarking/model/report/reportsubject/MsrSubjectSectionQuestion.java → smarking/src/main/java/com/xhkjedu/smarking/model/report/reportsubject/MsrSubjectQuestionSection.java

@@ -12,8 +12,8 @@ import javax.persistence.Table;
  * @Date 2024-12-12
  */
 @Data
-@Table(name = "msr_subject_section_question")
-public class MsrSubjectSectionQuestion extends BaseBean {
+@Table(name = "msr_subject_question_section")
+public class MsrSubjectQuestionSection extends BaseBean {
     @Id
     //阅卷报告-科目区间试题得分率表
     private Integer sqsid;
@@ -21,6 +21,8 @@ public class MsrSubjectSectionQuestion extends BaseBean {
     private Integer examid;
     //科目ID
     private String subjectid;
+    //类型1小题2客观题3主观题
+    private Integer qntype;
     //试题ID
     private Integer mptqid;
     //分数区间范围
@@ -32,5 +34,5 @@ public class MsrSubjectSectionQuestion extends BaseBean {
     //平均分
     private Double avgscore;
     //平均得分率
-    private Double avgscorerate;
+    private Double avgrate;
 }

smarking/src/main/java/com/xhkjedu/smarking/service/report/generate/ReportGenerateQuestionService.java

@@ -10,19 +10,22 @@ import com.xhkjedu.smarking.mapper.stupaper.MsPaperStudentQuestionMapper;
 import com.xhkjedu.smarking.model.exam.MsClassStudent;
 import com.xhkjedu.smarking.model.paper.MsPaper;
 import com.xhkjedu.smarking.model.paper.MsPaperQtypeQuestion;
+import com.xhkjedu.smarking.model.report.reportclass.MsrClassQtype;
 import com.xhkjedu.smarking.model.report.reportclass.MsrClassQuestion;
 import com.xhkjedu.smarking.model.report.reportclass.MsrClassQuestionObj;
 import com.xhkjedu.smarking.model.report.reportother.MsrReportparam;
 import com.xhkjedu.smarking.model.report.reportstu.MsrStudent;
-import com.xhkjedu.smarking.model.report.reportsubject.MsrSubjectSectionQuestion;
+import com.xhkjedu.smarking.model.report.reportsubject.MsrSubjectQuestionSection;
 import com.xhkjedu.smarking.model.stupaper.MsPaperStudentQuestion;
 import com.xhkjedu.smarking.utils.MarkingUtil;
+import com.xhkjedu.smarking.vo.report.reportother.RankGroupVo;
 import com.xhkjedu.smarking.vo.report.reportother.SzJsonVo;
 import com.xhkjedu.utils.N_Utils;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
@@ -47,128 +50,140 @@ public class ReportGenerateQuestionService {
     @Resource
     private MsPaperStudentMapper msPaperStudentMapper;
 
-    public void generateQuestion(Integer examid,Integer exammode){
-        //查询所有学生试题
+    public void generateQuestion(Integer examid, Integer exammode) {
+        // 查询所有学生试题
         List<MsPaperStudentQuestion> stuQuestions = msPaperStudentQuestionMapper.listAllStuQuesByExamid(examid);
         List<MsClassStudent> classStudents = msClassStudentMapper.listStudentByExamId(examid);
         List<MsPaper> subjects = msSubjectMapper.listReportSubject(examid, exammode);
         List<MsrStudent> stuPapers = msPaperStudentMapper.listPaperStudentByExamId(examid, null);
-        //获取考试参数
-        List<MsrReportparam> params = msrReportparamMapper.listReportparamByRpbelong(examid,"quesummary",null);
+        // 获取考试参数
+        List<MsrReportparam> params = msrReportparamMapper.listReportparamByRpbelong(examid, "quesummary", null);
 
-        //根据科目进行区分
-        for(MsPaper subject : subjects){
+        // 根据科目进行区分
+        for (MsPaper subject : subjects) {
             String subjectid = subject.getSubjectid();
-            //获取科目下所有学生试题
-            List<MsPaperStudentQuestion> subjectStuQuestions = stuQuestions.stream().filter(stuQuestion -> stuQuestion.getSubjectid().equals(subjectid)).collect(Collectors.toList());
-            //科目下所有班级学生
+            // 获取科目下所有学生试题
+            List<MsPaperStudentQuestion> subjectStuQuestions =
+                    stuQuestions.stream().filter(stuQuestion -> stuQuestion.getSubjectid().equals(subjectid)).collect(Collectors.toList());
+            // 科目下所有班级学生
             List<MsClassStudent> subjectClassStudents = classStudents.stream().filter(classStudent -> classStudent.getSubjectid().equals(subjectid)).collect(Collectors.toList());
-            //获取试卷中所有小题基础信息包含大题信息
+            // 获取试卷中所有小题基础信息包含大题信息
             List<MsPaperQtypeQuestion> questions = msPaperQtypeQuestionMapper.listQuestionsForReport(subject.getMpid());
-            //获取科目参数
+            // 获取科目参数
             List<MsrReportparam> subjectParams = params.stream().filter(p -> p.getSubjectid().equals(subjectid)).collect(Collectors.toList());
-            //获取学生科目得分
+            // 获取学生科目得分
             List<MsrStudent> subjectStuPapers = stuPapers.stream().filter(p -> p.getSubjectid().equals(subjectid)).collect(Collectors.toList());
-
-            //处理小题
-            handleQuestion(subjectStuQuestions,subjectClassStudents,questions,subjectParams,examid,subjectid);
+            // 获取学生科目得分-科目默认分段学生
+            List<MsrSubjectQuestionSection> subjectSectionQuestions = subjectSectionForQuestion(subjectStuPapers, subject.getPscore());
+            // 处理小题
+            handleQuestion(subjectStuQuestions, subjectClassStudents, questions, subjectParams, subjectSectionQuestions, examid, subjectid);
+            //处理题型
+            handleQtype(subjectStuQuestions, subjectClassStudents, questions, subjectParams, examid, subjectid);
         }
     }
 
-    //处理单个试题分析
-    private void handleQuestion(List<MsPaperStudentQuestion> subjectStuQuestions, List<MsClassStudent> subjectClassStudents,List<MsPaperQtypeQuestion> questions,List<MsrReportparam> params,Integer examid,String subjectid){
+    // 单个试题分析
+    private void handleQuestion(List<MsPaperStudentQuestion> subjectStuQuestions, List<MsClassStudent> subjectClassStudents, List<MsPaperQtypeQuestion> questions,
+                                List<MsrReportparam> params, List<MsrSubjectQuestionSection> subjectSectionQuestions, Integer examid, String subjectid) {
 
-        List<MsrClassQuestion> saveQuestions = new ArrayList<>();//小题分析
-        List<MsrClassQuestionObj> saveQuestionObjs = new ArrayList<>();//小题-客观题选项分析
+        List<MsrClassQuestion> saveQuestions = new ArrayList<>();// 小题分析
+        List<MsrClassQuestionObj> saveQuestionObjs = new ArrayList<>();// 小题-客观题选项分析
+        List<MsrSubjectQuestionSection> saveSectionQuestions = new ArrayList<>();// 学科分段之间学生在该题的整体得分率
 
-        //处理小题信息
-        for(MsPaperQtypeQuestion question : questions){
-            //获取第一小题所有作答情况，全校作答情况
+        // 处理小题信息
+        for (MsPaperQtypeQuestion question : questions) {
+            // 获取第一小题所有作答情况，全校作答情况
             List<MsPaperStudentQuestion> stuQuestions = subjectStuQuestions.stream().filter(q -> q.getMptqid().equals(question.getMptqid())).collect(Collectors.toList());
-            int stunum = stuQuestions.size();//学生数量
-            Double sumQScore = question.getQscore() * stunum;//小题得分
-            List<Double> stuScores = stuQuestions.stream().map(MsPaperStudentQuestion::getStuscore).collect(Collectors.toList());//所有学生得分
+            int stunum = stuQuestions.size();// 学生数量
+            Double sumQScore = question.getQscore() * stunum;// 小题得分
+            List<Double> stuScores = stuQuestions.stream().map(MsPaperStudentQuestion::getStuscore).collect(Collectors.toList());// 所有学生得分
 
-            Double maxScore = stuQuestions.stream().mapToDouble(MsPaperStudentQuestion::getStuscore).max().orElse(0.0);//最高分
-            Double minScore = stuQuestions.stream().mapToDouble(MsPaperStudentQuestion::getStuscore).min().orElse(0.0);//最低分
-            Double avgScore = MarkingUtil.calculateAverage(stuScores);//平均分
-            Double avgScoreRate = MarkingUtil.calculateRate(avgScore,sumQScore);//平均得分率
+            Double maxScore = stuQuestions.stream().mapToDouble(MsPaperStudentQuestion::getStuscore).max().orElse(0.0);// 最高分
+            Double minScore = stuQuestions.stream().mapToDouble(MsPaperStudentQuestion::getStuscore).min().orElse(0.0);// 最低分
+            Double avgScore = MarkingUtil.calculateAverage(stuScores);// 平均分
+            Double avgScoreRate = MarkingUtil.calculateRate(avgScore, sumQScore);// 平均得分率
 
             MsrClassQuestion schoolQ = new MsrClassQuestion();
-            schoolQ.setClassid(0);//全体班级
+            schoolQ.setClassid(0);// 全体班级
             schoolQ.setExamid(examid);
             schoolQ.setSubjectid(subjectid);
             schoolQ.setSchoolmaxscore(maxScore);
             schoolQ.setSchoolminscore(minScore);
             schoolQ.setSchoolavgscore(avgScore);
             schoolQ.setSchoolavgrate(avgScoreRate);
-            //班级试题情况
-            MsrClassQuestion schoolQue = handleQuestionClass(stuQuestions,question,params,schoolQ);
+            // 全校班级试题情况
+            MsrClassQuestion schoolQue = questionClass(stuQuestions, question, params, schoolQ);
             saveQuestions.add(schoolQue);
 
-            //班级试题--客观题选项情况
+            // 班级试题--客观题选项情况
             MsrClassQuestionObj qobj = new MsrClassQuestionObj();
-            if(question.getQtype() == 1){
+            if (question.getQtype() == 1) {
                 qobj.setExamid(examid);
                 qobj.setSubjectid(subjectid);
                 qobj.setClassid(0);
                 qobj.setMptqid(question.getMptqid());
-                List<MsrClassQuestionObj> qobjList = handleQuestionXuanxiang(stuQuestions,qobj);
+                List<MsrClassQuestionObj> qobjList = questionXuanxiang(stuQuestions, qobj);
                 saveQuestionObjs.addAll(qobjList);
             }
 
-            //班级试题分析
-            //获取所有班级
+            // 学科分段之间学生在该题的整体得分率
+            List<MsrSubjectQuestionSection> sectionQuestions = subjectSectionQuestion(stuQuestions, subjectSectionQuestions, question);
+            saveSectionQuestions.addAll(sectionQuestions);
+
+
+            // 班级试题分析
+            // 获取所有班级
             List<Integer> classIds = subjectClassStudents.stream().map(MsClassStudent::getClassid).distinct().collect(Collectors.toList());
-            for(Integer classid : classIds){
-                //获取班级下学生id
-                List<Integer> classStuIds = subjectClassStudents.stream().filter(c -> c.getClassid().equals(classid)).map(MsClassStudent::getStudentid).collect(Collectors.toList());
-                //获取班级下学生试题
+            for (Integer classid : classIds) {
+                // 获取班级下学生id
+                List<Integer> classStuIds =
+                        subjectClassStudents.stream().filter(c -> c.getClassid().equals(classid)).map(MsClassStudent::getStudentid).collect(Collectors.toList());
+                // 获取班级下学生试题
                 List<MsPaperStudentQuestion> classStuQuestions = stuQuestions.stream().filter(q -> classStuIds.contains(q.getStudentid())).collect(Collectors.toList());
                 schoolQ.setClassid(classid);
-                MsrClassQuestion classQue = handleQuestionClass(classStuQuestions,question,params,schoolQ);
+                MsrClassQuestion classQue = questionClass(classStuQuestions, question, params, schoolQ);
                 saveQuestions.add(classQue);
 
-                //班级试题--客观题选项情况
-                if(question.getQtype() == 1) {
+                // 班级试题--客观题选项情况
+                if (question.getQtype() == 1) {
                     qobj.setClassid(classid);
-                    List<MsrClassQuestionObj> qobjList = handleQuestionXuanxiang(classStuQuestions,qobj);
+                    List<MsrClassQuestionObj> qobjList = questionXuanxiang(classStuQuestions, qobj);
                     saveQuestionObjs.addAll(qobjList);
                 }
             }
         }
     }
 
-    //处理单个试题分析-学校、班级分析
-    private MsrClassQuestion handleQuestionClass(List<MsPaperStudentQuestion> stuQuestions,MsPaperQtypeQuestion question,List<MsrReportparam> params,MsrClassQuestion schoolQ){
-        int stunum = stuQuestions.size();//学生数量
-        Double qScore = question.getQscore();//试题分值
-        Double sumQScore = question.getQscore() * stunum;//小题得分
-        List<Double> stuScores = stuQuestions.stream().map(MsPaperStudentQuestion::getStuscore).collect(Collectors.toList());//所有学生得分
-        Double sumStuScore = stuQuestions.stream().mapToDouble(MsPaperStudentQuestion::getStuscore).sum();//综合
-
-        Double maxScore;//最高分
-        Double minScore;//最低分
-        Double avgScore;//平均分
-        Double avgScoreRate;//平均得分率
-        if(schoolQ.getClassid() == 0){
-            //代表是校级
+    // 单个试题分析-学校、班级分析
+    private MsrClassQuestion questionClass(List<MsPaperStudentQuestion> stuQuestions, MsPaperQtypeQuestion question, List<MsrReportparam> params, MsrClassQuestion schoolQ) {
+        int stunum = stuQuestions.size();// 学生数量
+        Double qScore = question.getQscore();// 试题分值
+        Double sumQScore = question.getQscore() * stunum;// 小题得分
+        List<Double> stuScores = stuQuestions.stream().map(MsPaperStudentQuestion::getStuscore).collect(Collectors.toList());// 所有学生得分
+        Double sumStuScore = stuQuestions.stream().mapToDouble(MsPaperStudentQuestion::getStuscore).sum();// 综合
+
+        Double maxScore;// 最高分
+        Double minScore;// 最低分
+        Double avgScore;// 平均分
+        Double avgScoreRate;// 平均得分率
+        if (schoolQ.getClassid() == 0) {
+            // 代表是校级
             maxScore = schoolQ.getSchoolmaxscore();
             minScore = schoolQ.getSchoolminscore();
             avgScore = schoolQ.getSchoolavgscore();
             avgScoreRate = schoolQ.getSchoolavgrate();
-        }else{
-            //指定班级
-            maxScore = stuQuestions.stream().mapToDouble(MsPaperStudentQuestion::getStuscore).max().orElse(0.0);//最高分
-            minScore = stuQuestions.stream().mapToDouble(MsPaperStudentQuestion::getStuscore).min().orElse(0.0);//最低分
-            avgScore = MarkingUtil.calculateAverage(stuScores);//平均分
-            avgScoreRate = MarkingUtil.calculateRate(avgScore,sumQScore);//平均得分率
+        } else {
+            // 指定班级
+            maxScore = stuQuestions.stream().mapToDouble(MsPaperStudentQuestion::getStuscore).max().orElse(0.0);// 最高分
+            minScore = stuQuestions.stream().mapToDouble(MsPaperStudentQuestion::getStuscore).min().orElse(0.0);// 最低分
+            avgScore = MarkingUtil.calculateAverage(stuScores);// 平均分
+            avgScoreRate = MarkingUtil.calculateRate(avgScore, sumQScore);// 平均得分率
         }
-        Double stuScoreRate = MarkingUtil.calculateRate(sumStuScore,sumQScore);//学生得分率
+        Double stuScoreRate = MarkingUtil.calculateRate(sumStuScore, sumQScore);// 学生得分率
         MsrClassQuestion classQ = new MsrClassQuestion();
         classQ.setExamid(schoolQ.getExamid());
         classQ.setSubjectid(schoolQ.getSubjectid());
-        classQ.setClassid(schoolQ.getClassid());//班级id
+        classQ.setClassid(schoolQ.getClassid());// 班级id
         classQ.setMptqid(question.getMptqid());
         classQ.setQtype(question.getQtype());
         classQ.setQn(question.getMptqn() + "." + question.getQn());
@@ -185,39 +200,40 @@ public class ReportGenerateQuestionService {
         classQ.setSchoolavgrate(schoolQ.getSchoolavgrate());
 
         classQ.setScorerate(stuScoreRate);
-        classQ.setScoreratec(MarkingUtil.sub(MarkingUtil.calculateRate(maxScore,qScore),MarkingUtil.calculateRate(minScore,qScore)));//得分率差=最高得分率-最低得分率
-        classQ.setNd(MarkingUtil.div(stuScoreRate,qScore));//难度
-        String[] ndStr = handleQuestionNdAndQfd(params,1,classQ.getNd());
-        classQ.setNdms(ndStr[0]);//难度描述
-        classQ.setNdfw(ndStr[1]);//难度范围
-        classQ.setQfd(MarkingUtil.qfd(stuScores));//区分度
-        String[] qfdStr = handleQuestionNdAndQfd(params,2,classQ.getNd());
-        classQ.setQfdms(qfdStr[0]);//区分度描述
-        classQ.setQfdfw(qfdStr[1]);//区分度范围
-        classQ.setBzc(MarkingUtil.bzc(stuScores));//标准差
-        classQ.setCyxs(MarkingUtil.div(classQ.getBzc(),avgScore));//差异系数
-        classQ.setJbzs(MarkingUtil.jbzs(stuScores,stuScoreRate));//鉴别指数
-        //获取所有满分学生
+        classQ.setScoreratec(MarkingUtil.sub(MarkingUtil.calculateRate(maxScore, qScore), MarkingUtil.calculateRate(minScore, qScore)));// 得分率差=最高得分率-最低得分率
+        classQ.setNd(MarkingUtil.div(stuScoreRate, qScore));// 难度
+        String[] ndStr = questionNdAndQfd(params, 1, classQ.getNd());
+        classQ.setNdms(ndStr[0]);// 难度描述
+        classQ.setNdfw(ndStr[1]);// 难度范围
+        classQ.setQfd(MarkingUtil.qfd(stuScores));// 区分度
+        String[] qfdStr = questionNdAndQfd(params, 2, classQ.getQfd());
+        classQ.setQfdms(qfdStr[0]);// 区分度描述
+        classQ.setQfdfw(qfdStr[1]);// 区分度范围
+        classQ.setBzc(MarkingUtil.bzc(stuScores));// 标准差
+        classQ.setCyxs(MarkingUtil.div(classQ.getBzc(), avgScore));// 差异系数
+        classQ.setJbzs(MarkingUtil.jbzs(stuScores, stuScoreRate));// 鉴别指数
+        // 获取所有满分学生
         List<MsPaperStudentQuestion> fullStuQuestions = stuQuestions.stream().filter(q -> q.getStuscore().equals(q.getQscore())).collect(Collectors.toList());
-        String mfids = fullStuQuestions.stream().map(p -> p.getStudentid().toString()).collect(Collectors.joining(","));//满分学生id
+        String mfids = fullStuQuestions.stream().map(p -> p.getStudentid().toString()).collect(Collectors.joining(","));// 满分学生id
         classQ.setMfnum(fullStuQuestions.size());
         classQ.setMfrate(MarkingUtil.div(classQ.getMfnum(), stunum));////正确率、满分人数占比
         classQ.setMfids(mfids);
-        //获取零分学生
-        List<MsPaperStudentQuestion> lfStuQuestions = stuQuestions.stream().filter(q -> q.getStuscore()==0).collect(Collectors.toList());
-        String lfids = lfStuQuestions.stream().map(p -> p.getStudentid().toString()).collect(Collectors.joining(","));//零分学生id
+        // 获取零分学生
+        List<MsPaperStudentQuestion> lfStuQuestions = stuQuestions.stream().filter(q -> q.getStuscore() == 0).collect(Collectors.toList());
+        String lfids = lfStuQuestions.stream().map(p -> p.getStudentid().toString()).collect(Collectors.joining(","));// 零分学生id
         classQ.setLfnum(lfStuQuestions.size());
-        classQ.setLfrate(MarkingUtil.div(lfStuQuestions.size(),stunum));////零分人数占比
+        classQ.setLfrate(MarkingUtil.div(lfStuQuestions.size(), stunum));////零分人数占比
         classQ.setLfids(lfids);
         return classQ;
     }
-    //处理单个试题分析-试题难度、区分度
-    private String[] handleQuestionNdAndQfd(List<MsrReportparam> params,Integer rptype,Double nd){
-        //获取难度或者区分度
-        MsrReportparam ndParam = params.stream().filter(p -> p.getRptype().equals(rptype)).findFirst().orElse(null);//难度
+
+    // 单个试题分析-试题难度、区分度
+    private String[] questionNdAndQfd(List<MsrReportparam> params, Integer rptype, Double nd) {
+        // 获取难度或者区分度
+        MsrReportparam ndParam = params.stream().filter(p -> p.getRptype().equals(rptype)).findFirst().orElse(null);// 难度
         String ndms = "";
         String ndfw = "";
-        if(ndParam!= null){
+        if (ndParam != null) {
             List<SzJsonVo> szList = JSON.parseArray(ndParam.getSzjson(), SzJsonVo.class);
             for (SzJsonVo sz : szList) {
                 if (nd == 1 && sz.getMaxvalue() == 1) {
@@ -228,21 +244,22 @@ public class ReportGenerateQuestionService {
                     ndms = sz.getDjkey();
                     ndfw = "[0" + "~" + sz.getMaxvalue() + ")";
                     break;
-                } else if(nd >= sz.getMinvalue() && nd < sz.getMaxvalue()) {
+                } else if (nd >= sz.getMinvalue() && nd < sz.getMaxvalue()) {
                     ndms = sz.getDjkey();
                     ndfw = "[" + sz.getMinvalue() + "~" + sz.getMaxvalue() + ")";
                     break;
                 }
             }
         }
-        return new String[]{ndms,ndfw};
+        return new String[]{ndms, ndfw};
     }
-    //处理单个试题分析-客观题选项情况
-    private List<MsrClassQuestionObj> handleQuestionXuanxiang(List<MsPaperStudentQuestion> stuQuestions,MsrClassQuestionObj questionObj){
-        Map<String,List<MsPaperStudentQuestion>> optionMap = stuQuestions.stream().collect(Collectors.groupingBy(MsPaperStudentQuestion::getStuanswer));
+
+    // 单个试题分析-客观题选项情况
+    private List<MsrClassQuestionObj> questionXuanxiang(List<MsPaperStudentQuestion> stuQuestions, MsrClassQuestionObj questionObj) {
+        Map<String, List<MsPaperStudentQuestion>> optionMap = stuQuestions.stream().collect(Collectors.groupingBy(MsPaperStudentQuestion::getStuanswer));
         int totalNum = stuQuestions.size();
         List<MsrClassQuestionObj> qobjList = new ArrayList<>();
-        for(Map.Entry<String,List<MsPaperStudentQuestion>> entry : optionMap.entrySet()){
+        for (Map.Entry<String, List<MsPaperStudentQuestion>> entry : optionMap.entrySet()) {
             String option = entry.getKey();
             List<MsPaperStudentQuestion> optionStuQuestions = entry.getValue();
 
@@ -251,13 +268,13 @@ public class ReportGenerateQuestionService {
             qobj.setSubjectid(questionObj.getSubjectid());
             qobj.setClassid(questionObj.getClassid());
             qobj.setMptqid(questionObj.getMptqid());
-            if(N_Utils.isNotEmpty(option)){
+            if (N_Utils.isNotEmpty(option)) {
                 qobj.setXxda(option);
-            }else{
+            } else {
                 qobj.setXxda("未选");
             }
             qobj.setXxnum(optionStuQuestions.size());
-            qobj.setXxrate(MarkingUtil.calculateRate(optionStuQuestions.size(),totalNum));
+            qobj.setXxrate(MarkingUtil.calculateRate(optionStuQuestions.size(), totalNum));
             String stuids = optionStuQuestions.stream().map(q -> q.getStudentid().toString()).collect(Collectors.joining(","));
             qobj.setStuids(stuids);
             qobjList.add(qobj);
@@ -265,15 +282,151 @@ public class ReportGenerateQuestionService {
         return qobjList;
     }
 
-    //处理科目分段-默认5分一段为后续试题做准备
-    private void handleSubjectSectionForQuestion(List<MsrStudent> StuPapers,Double pscore){
-        //把科目总分分段，默认5分一段
-        List<int[]> fdList = MarkingUtil.fdScore(pscore,5);
-        List<MsrSubjectSectionQuestion> sections = new ArrayList<>();
-        for(int[] fd : fdList){
-            //获取学生得分在指定区间的学生
-            List<MsrStudent> fdStuPapers = StuPapers.stream().filter(s -> s.getStuscore() >= fd[0] && s.getStuscore() < fd[1]).collect(Collectors.toList());
-            //计算分段平均分
+    // 单个试题-科目分段-默认5分一段为后续试题在段上学生得分率做准备
+    private List<MsrSubjectQuestionSection> subjectSectionForQuestion(List<MsrStudent> StuPapers, Double pscore) {
+        // 把科目总分分段，默认5分一段
+        List<RankGroupVo> fdList = MarkingUtil.fdScore(pscore, 5);
+        List<MsrSubjectQuestionSection> sections = new ArrayList<>();
+        MsrStudent fdStuPaper = StuPapers.get(0);
+        for (RankGroupVo fd : fdList) {
+            // 获取学生得分在指定区间的学生
+            List<MsrStudent> fdStuPapers;
+            if (fd.getMaxvalue() == pscore) {
+                fdStuPapers = StuPapers.stream().filter(s -> s.getStuscore() >= fd.getMinvalue() && s.getStuscore() <= fd.getMaxvalue()).collect(Collectors.toList());
+            } else {
+                fdStuPapers = StuPapers.stream().filter(s -> s.getStuscore() >= fd.getMinvalue() && s.getStuscore() < fd.getMaxvalue()).collect(Collectors.toList());
+            }
+
+            MsrSubjectQuestionSection question = new MsrSubjectQuestionSection();
+            question.setExamid(fdStuPaper.getExamid());
+            question.setSubjectid(fdStuPaper.getSubjectid());
+            question.setFdfw(fd.getGroupname());
+            question.setFdnum(fdStuPapers.size());
+            question.setFdids(fdStuPapers.stream().map(s -> s.getStudentid().toString()).collect(Collectors.joining(",")));
+            sections.add(question);
+        }
+        return sections;
+    }
+
+    // 单个试题分析-科目分段区间得分率
+    private List<MsrSubjectQuestionSection> subjectSectionQuestion(List<MsPaperStudentQuestion> stuQuestions, List<MsrSubjectQuestionSection> sections,
+                                                                         MsPaperQtypeQuestion question) {
+        List<MsrSubjectQuestionSection> rtnList = new ArrayList<>();
+        for (MsrSubjectQuestionSection section : sections) {
+            String[] userids = section.getFdids().split(",");
+            List<String> useridList = Arrays.asList(userids);
+            List<MsPaperStudentQuestion> sectionStuQuestions = stuQuestions.stream().filter(q -> useridList.contains(q.getStudentid().toString())).collect(Collectors.toList());
+            // 获取总分
+            double sumScore = sectionStuQuestions.stream().mapToDouble(MsPaperStudentQuestion::getStuscore).sum();
+            int stuNum = sectionStuQuestions.size();
+            // 获取平均分
+            double avgScore = MarkingUtil.div(sumScore, stuNum);
+            // 获取平均得分率
+            double avgScoreRate = MarkingUtil.calculateRate(avgScore, question.getQscore());
+            section.setAvgscore(avgScore);
+            section.setAvgrate(avgScoreRate);
+            section.setQntype(1);
+            section.setMptqid(question.getMptqid());
+            rtnList.add(section);
         }
+        return rtnList;
     }
+
+    // 题型分析
+    private void handleQtype(List<MsPaperStudentQuestion> subjectStuQuestions,List<MsClassStudent> subjectClassStudents, List<MsPaperQtypeQuestion> questions,
+                             List<MsrReportparam> params,Integer examid, String subjectid) {
+        List<MsrClassQtype> saveQtypes = new ArrayList<>();//班级题型分析
+        // 处理大题
+        Map<Integer, List<MsPaperQtypeQuestion>> qtypeMap = questions.stream().collect(Collectors.groupingBy(MsPaperQtypeQuestion::getMptid));
+        for (Map.Entry<Integer, List<MsPaperQtypeQuestion>> entry : qtypeMap.entrySet()) {
+            List<MsPaperQtypeQuestion> qtypeQuestions = entry.getValue();
+            Double fullScore = qtypeQuestions.stream().mapToDouble(MsPaperQtypeQuestion::getQscore).sum();// 题型满分
+
+            // 获取所有题型下试题id集合
+            List<Integer> mptqids = qtypeQuestions.stream().map(MsPaperQtypeQuestion::getMptqid).distinct().collect(Collectors.toList());
+            // 获取题型下所有学生试题情况
+            List<MsPaperStudentQuestion> stuQuestions = subjectStuQuestions.stream().filter(q -> mptqids.contains(q.getMptqid())).collect(Collectors.toList());
+            //初始化信息
+            MsrClassQtype schoolQtype = new MsrClassQtype();
+            schoolQtype.setExamid(examid);
+            schoolQtype.setSubjectid(subjectid);
+            schoolQtype.setClassid(0);
+            schoolQtype.setMptid(entry.getKey());
+            schoolQtype.setMptqn(qtypeQuestions.get(0).getMptqn());
+            schoolQtype.setFullscore(fullScore);
+
+            //全校班级题型情况
+            MsrClassQtype qtypeSchool = qtypeClass(stuQuestions, params, schoolQtype);
+            saveQtypes.add(qtypeSchool);
+
+            // 班级题型分析
+            // 获取所有班级
+            List<Integer> classIds = subjectClassStudents.stream().map(MsClassStudent::getClassid).distinct().collect(Collectors.toList());
+            for (Integer classid : classIds) {
+                schoolQtype.setClassid(classid);
+                // 获取班级下学生id
+                List<Integer> classStuIds =
+                        subjectClassStudents.stream().filter(c -> c.getClassid().equals(classid)).map(MsClassStudent::getStudentid).collect(Collectors.toList());
+                // 获取班级下学生试题
+                List<MsPaperStudentQuestion> classStuQuestions = stuQuestions.stream().filter(q -> classStuIds.contains(q.getStudentid())).collect(Collectors.toList());
+                 // 班级题型分析
+                MsrClassQtype qtypeClass = qtypeClass(classStuQuestions, params, schoolQtype);
+                saveQtypes.add(qtypeClass);
+            }
+        }
+    }
+    // 题型分析-学校、班级分析
+    private MsrClassQtype qtypeClass(List<MsPaperStudentQuestion> stuQuestions, List<MsrReportparam> params,MsrClassQtype schoolQtype){
+        // 获取所有学生id
+        List<Integer> studentIds = stuQuestions.stream().map(MsPaperStudentQuestion::getStudentid).distinct().collect(Collectors.toList());
+        int stuNum = stuQuestions.size();
+        List<Double> stuScores = new ArrayList<>();
+        int mfnum = 0;
+        String mfids = "";
+        int lfnum = 0;
+        String lfids = "";
+        for (Integer studentId : studentIds) {
+            List<MsPaperStudentQuestion> stuQtype = stuQuestions.stream().filter(q -> studentId.equals(q.getMptqid())).collect(Collectors.toList());
+            Double stuQtypeScore = stuQtype.stream().mapToDouble(MsPaperStudentQuestion::getStuscore).sum();
+            stuScores.add(stuQtypeScore);
+            if(schoolQtype.getFullscore() == stuQtypeScore){
+                mfnum++;
+                mfids += studentId + ",";
+            }else{
+                lfnum++;
+                lfids += studentId + ",";
+            }
+        }
+
+        Double stuSumScore = stuQuestions.stream().mapToDouble(MsPaperStudentQuestion::getStuscore).sum();// 学生总分
+        Double avgScore = MarkingUtil.div(stuSumScore, stuNum);// 平均分
+
+        MsrClassQtype classQtype = new MsrClassQtype();
+        classQtype.setExamid(schoolQtype.getExamid());
+        classQtype.setSubjectid(schoolQtype.getSubjectid());
+        classQtype.setClassid(schoolQtype.getClassid());
+        classQtype.setMptid(schoolQtype.getMptid());
+        classQtype.setMptqn(schoolQtype.getMptqn());
+        classQtype.setFullscore(schoolQtype.getFullscore());
+        classQtype.setAvgscore(avgScore);
+        classQtype.setBzc(MarkingUtil.bzc(stuScores));
+        classQtype.setNd(MarkingUtil.div(avgScore, schoolQtype.getFullscore()));
+        classQtype.setNdms(questionNdAndQfd(params, 1, schoolQtype.getNd())[0]);
+        classQtype.setQfd(MarkingUtil.qfd(stuScores));
+        classQtype.setQfdms(questionNdAndQfd(params, 2, schoolQtype.getQfd())[0]);
+        classQtype.setMfnum(mfnum);
+        classQtype.setMfrate(MarkingUtil.div(mfnum, stuNum));
+        if(mfnum > 0){
+            schoolQtype.setMfids(mfids.substring(0,mfids.length()-1));
+        }
+        classQtype.setMfids(mfids);
+        classQtype.setLfnum(lfnum);
+        classQtype.setLfrate(MarkingUtil.div(lfnum, stuNum));
+        if(lfnum > 0){
+            classQtype.setMfids(lfids.substring(0,lfids.length()-1));
+        }
+
+        return classQtype;
+    }
+
 }

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

@@ -539,24 +539,29 @@ public class MarkingUtil {
         return sub(topRate, bottomRate);
     }
 
-    //排名分组计算 用于第一组(第1-10名)
-    public static List<RankGroupVo> rankGroup(Integer total) {
+    //排名分组计算 参数[总名次，分组数] 如：第一组(第1-10名)
+    public static List<RankGroupVo> rankGroup(Integer total,Integer groupNum) {
         List<RankGroupVo> rtnList = new ArrayList<>();
 
-        int count = total / 10;
-        for (int i = 0; i < count; i++) {
-            RankGroupVo rg = new RankGroupVo();
-            rg.setMaxvalue((i + 1) * 10);
-            rg.setMinvalue(i * 10 + 1);
-            rtnList.add(rg);
-        }
+        int average = total / groupNum;
+        int remainder = total % groupNum;
+
+        for (int i = 0; i < groupNum; i++) {
+            int min;
+            int max;
+            if (i < remainder) {
+                min = average * i + i + 1;
+                max = average * (i + 1) + i + 1;
+            } else {
+                min = average * i + remainder + 1;
+                max = average * (i + 1) + remainder;
+            }
 
-        if (total % 10 > 0) {
-            //未被整除，添加最后一组
-            RankGroupVo rg = new RankGroupVo();
-            rg.setMaxvalue(total);
-            rg.setMinvalue(count * 10 + 1);
-            rtnList.add(rg);
+            RankGroupVo rgvo = new RankGroupVo();
+            rgvo.setGroupname("第" + (i + 1) + "组(" + min + "~" + max + ")");
+            rgvo.setMinvalue(min);
+            rgvo.setMaxvalue(max);
+            rtnList.add(rgvo);
         }
         return rtnList;
     }
@@ -582,11 +587,23 @@ public class MarkingUtil {
     }
 
     // 分数段 分数分段
-    public static List<int[]> fdScore(Double totalScore,int fdscore){
-        List<int[]> rtnList = new ArrayList<>();
+    public static List<RankGroupVo> fdScore(Double totalScore,int fdscore){
+        List<RankGroupVo> rtnList = new ArrayList<>();
         for (int i = 0; i < totalScore; i += fdscore) {
             int end = (int) Math.min(i + fdscore, totalScore);
-            rtnList.add(new int[]{i, end});
+
+            String groupname = "[" + i + "~" + end;
+            if(end == totalScore){
+                groupname+="]";
+            }else {
+                groupname+=")";
+            }
+
+            RankGroupVo rgvo = new RankGroupVo();
+            rgvo.setGroupname(groupname);
+            rgvo.setMinvalue(i);
+            rgvo.setMaxvalue(end);
+            rtnList.add(rgvo);
         }
         return rtnList;
     }
@@ -607,9 +624,9 @@ public class MarkingUtil {
         return "";
     }
     public static void main(String[] args) {
-        List<int[]> rtnList = fdScore(84.0, 5);
-        for (int[] rtn : rtnList) {
-            System.out.println(rtn[0] + "-" + rtn[1]);
+        List<RankGroupVo> rtnList = fdScore(88.0, 6);
+        for (RankGroupVo rg : rtnList) {
+            System.out.println(rg.getGroupname() + ": " + rg.getMinvalue() + "-" + rg.getMaxvalue());
         }
     }
 }

smarking/src/main/java/com/xhkjedu/smarking/vo/report/reportother/RankGroupVo.java

@@ -10,9 +10,11 @@ import lombok.Data;
 @Data
 public class RankGroupVo {
 
+    private String groupname;
+
     //最大值
-    private Integer maxvalue;
+    private int maxvalue;
 
     //最小值
-    private Integer minvalue;
+    private int minvalue;
 }

smarking/src/main/resources/mapper/report/reportclass/MsrClassQuestionRankgroupMapper.xml → smarking/src/main/resources/mapper/report/reportsubject/MsrSubjectQuestionRankgroupMapper.xml

@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.xhkjedu.smarking.mapper.report.reportclass.MsrClassQuestionRankgroupMapper">
+<mapper namespace="com.xhkjedu.smarking.mapper.report.reportsubject.MsrSubjectQuestionRankgroupMapper">
 </mapper>

smarking/src/main/resources/mapper/report/reportsubject/MsrSubjectSectionQuestionMapper.xml → smarking/src/main/resources/mapper/report/reportsubject/MsrSubjectQuestionSectionMapper.xml

@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.xhkjedu.smarking.mapper.report.reportsubject.MsrSubjectSectionQuestionMapper">
+<mapper namespace="com.xhkjedu.smarking.mapper.report.reportsubject.MsrSubjectQuestionSectionMapper">
 </mapper>