知识点分析

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

@@ -2,6 +2,7 @@ package com.xhkjedu.smarking.mapper.report.reportclass;
 
 import com.xhkjedu.base.TkMapper;
 import com.xhkjedu.smarking.model.report.reportclass.MsrClassQuestion;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * @Description 阅卷报告-班级试题小题分析表 Mapper 接口
@@ -9,4 +10,6 @@ import com.xhkjedu.smarking.model.report.reportclass.MsrClassQuestion;
  * @Date 2024-12-09
  */
 public interface MsrClassQuestionMapper extends TkMapper<MsrClassQuestion> {
+
+    void deleteReportByExamid(@Param("examid") Integer examid);
 }

smarking/src/main/java/com/xhkjedu/smarking/mapper/report/reportother/MsrExamMapper.java

@@ -2,6 +2,7 @@ package com.xhkjedu.smarking.mapper.report.reportother;
 
 import com.xhkjedu.base.TkMapper;
 import com.xhkjedu.smarking.model.report.reportother.MsrExam;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * @Description 阅卷报告-总体分析表 Mapper 接口
@@ -9,4 +10,7 @@ import com.xhkjedu.smarking.model.report.reportother.MsrExam;
  * @Date 2024-12-09
  */
 public interface MsrExamMapper extends TkMapper<MsrExam> {
+
+    //清除单次考试所有报告
+    void deleteReportByExamid(@Param("examid") int examid);
 }

smarking/src/main/java/com/xhkjedu/smarking/mapper/report/reportstu/MsrStudentMapper.java

@@ -14,4 +14,6 @@ import java.util.List;
 public interface MsrStudentMapper extends TkMapper<MsrStudent> {
     //获取学生考试得分和排名
     List<MsrStudent> listStuScoreAndRankByExamid(@Param("examid") int examid);
+    //批量修改学生主观题、客观题分值
+    void updateBatchObjSubScore(@Param("list") List<MsrStudent> list);
 }

smarking/src/main/java/com/xhkjedu/smarking/model/paper/MsTemplateBlock.java

@@ -27,6 +27,8 @@ public class MsTemplateBlock extends BaseBean {
     private String blockname;
     //类型1客观题2主观题
     private Integer mttype;
+    //客观题方向1横向2纵向
+    private Integer direct;
     //排序/首题号
     private Integer mtborder;
     //定位区坐标

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

@@ -23,6 +23,8 @@ public class MsrClassQobjsub extends BaseBean {
     private String subjectid;
     //班级ID
     private Integer classid;
+    //参考人数
+    private Integer stunum;
     //类型1客观题2主观题
     private Integer qtype;
     //满分

smarking/src/main/java/com/xhkjedu/smarking/model/report/reportother/MsrReportparam.java

@@ -23,7 +23,7 @@ public class MsrReportparam extends BaseBean {
     //归属报告模块编码：zh综合报告 xj校级报告 xk学科报告 bj班级报告 xs学生报告 mtzl命题质量报告 jxzl教学质量报告 xksy学科素养报告
     private String reportcode;
 
-    //归属：rank排行榜 scorerate班级对比得分率 allrate班级对比表综合率  allrate班级对比表综合率 quesummary试题汇总 scoresection分数分段统计
+    //归属：rank排行榜 scorerate班级对比得分率 allrate班级对比表综合率 quesummary试题汇总 scoresection分数分段统计
     // rankrate名次和比例分析  gradescore分档分数线 nearline临界生群体分析 subjectshow学科考试表现 keystu重点学生信息
     private String rpbelong;
     //类型

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

@@ -25,8 +25,6 @@ public class MsrSubjectQuestionRankgroup extends BaseBean {
     private Integer qntype;
     //试题ID
     private Integer mptqid;
-    //分数值
-    private Double rgscore;
     //组别和名次 第1组(1~70名)
     private String rgroup;
     //类型1客观题选项 2客/主分值

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

@@ -2,7 +2,10 @@ package com.xhkjedu.smarking.service.report.generate;
 
 import com.alibaba.fastjson.JSON;
 import com.xhkjedu.smarking.mapper.paper.MsPaperAnalyzeMapper;
+import com.xhkjedu.smarking.mapper.report.reportstu.MsrStudentPointMapper;
 import com.xhkjedu.smarking.mapper.report.reportsubject.MsrSubjectPointMapper;
+import com.xhkjedu.smarking.mapper.report.reportsubject.MsrSubjectPointRankgroupMapper;
+import com.xhkjedu.smarking.mapper.report.reportsubject.MsrSubjectPointSectionMapper;
 import com.xhkjedu.smarking.model.exam.MsClassStudent;
 import com.xhkjedu.smarking.model.paper.MsPaperAnalyze;
 import com.xhkjedu.smarking.model.paper.MsPaperQtypeQuestion;
@@ -39,6 +42,12 @@ public class ReportGeneratePointService {
     private MsPaperAnalyzeMapper msPaperAnalyzeMapper;
     @Resource
     private MsrSubjectPointMapper msrSubjectPointMapper;
+    @Resource
+    private MsrSubjectPointSectionMapper msrSubjectPointSectionMapper;
+    @Resource
+    private MsrSubjectPointRankgroupMapper msrSubjectPointRankgroupMapper;
+    @Resource
+    private MsrStudentPointMapper msrStudentPointMapper;
 
     //知识点分析，题库知识点按母题分析
     public void generatePoint(List<MsPaperStudentQuestion> stuSubjectQuestions, List<MsPaperQtypeQuestion> qtypeQuestions,List<MsClassStudent> classStus,
@@ -86,7 +95,7 @@ public class ReportGeneratePointService {
 
         //学科总分区间学生
         List<MsrSubjectPointSection> pointSections = setPointSection(sturanks,pscore);
-        Map<Integer,String> qnMap = qtypeQuestions.stream().collect(Collectors.toMap(q-> q.getMptqid(), q -> q.getMptqn() + "." + q.getQn()));
+        Map<Integer,String> qnMap = qtypeQuestions.stream().collect(Collectors.toMap(MsPaperQtypeQuestion::getMptqid, q -> q.getMptqn() + "." + q.getQn()));
 
         //知识点本分分析（三级知识点分析）
         for(PointQuestionVo pqvo : pointques){
@@ -177,6 +186,11 @@ public class ReportGeneratePointService {
                 pointTopAndUpForOther(stuPoints,ques,qnMap,pointParams,classStus,pointSections,sturanks,saveStuPoints,saveSubjectPoints,savePointSections,savePointRankgroups);
             }
         }
+
+        if(!saveStuPoints.isEmpty()) msrStudentPointMapper.insertList(saveStuPoints);
+        if(!saveSubjectPoints.isEmpty()) msrSubjectPointMapper.insertList(saveSubjectPoints);
+        if(!savePointSections.isEmpty()) msrSubjectPointSectionMapper.insertList(savePointSections);
+        if(!savePointRankgroups.isEmpty()) msrSubjectPointRankgroupMapper.insertList(savePointRankgroups);
     }
 
     // 知识点:设置每个学生每个试题知识点得分
@@ -214,7 +228,6 @@ public class ReportGeneratePointService {
         List<Double> stuScores = pointStuScores.stream().map(PointStudentVo::getStuscore).collect(Collectors.toList());
         double sumScore = pointStuScores.stream().mapToDouble(PointStudentVo::getStuscore).sum();
         int stuNum = pointStuScores.size();
-        double stuScoreRate = MarkingUtil.calculateRate(sumScore, pointStuScores.stream().mapToDouble(PointStudentVo::getScore).sum());
         MsrSubjectPoint classPoint = new MsrSubjectPoint();
         classPoint.setExamid(subjectPoint.getExamid());
         classPoint.setSubjectid(subjectPoint.getSubjectid());
@@ -231,7 +244,7 @@ public class ReportGeneratePointService {
         classPoint.setBzc(MarkingUtil.bzc(stuScores));
         classPoint.setCyxs(MarkingUtil.div(classPoint.getBzc(), classPoint.getAvgscore()));
         classPoint.setQfd(MarkingUtil.qfd(stuScores));
-        classPoint.setJbzs(MarkingUtil.jbzs(stuScores, stuScoreRate));
+        classPoint.setJbzs(MarkingUtil.jbzs(stuScores, subjectPoint.getFullscore()));
         classPoint.setQns(subjectPoint.getQns());
         classPoint.setMptqids(subjectPoint.getMptqids());
         return classPoint;
@@ -263,25 +276,36 @@ public class ReportGeneratePointService {
         return sections;
     }
     //知识点-与总分分数区间相关性分析
-    private List<MsrSubjectPointSection> pointSection(List<PointStudentVo> pointStuScores,List<MsrSubjectPointSection> sections,PointQuestionVo pqvo,Integer pointlevel){
+    private List<MsrSubjectPointSection> pointSection(List<PointStudentVo> pointStuScores,List<MsrSubjectPointSection> sections,PointParams pointParams){
         List<MsrSubjectPointSection> rtnList = new ArrayList<>();
         for(MsrSubjectPointSection section : sections){
             String[] userids = section.getFdids().split(",");
             List<String> useridList = Arrays.asList(userids);
             List<PointStudentVo> sectionStuPoints = pointStuScores.stream().filter(q -> useridList.contains(q.getStudentid().toString())).collect(Collectors.toList());
-            // 获取总分
-            double sumScore = sectionStuPoints.stream().mapToDouble(PointStudentVo::getStuscore).sum();
-            int stuNum = sectionStuPoints.size();
-            // 获取平均分
-            double avgScore = MarkingUtil.div(sumScore, stuNum);
-            // 获取平均得分率
-            double avgScoreRate = MarkingUtil.calculateRate(avgScore, pqvo.getScore());
-            section.setAvgrate(avgScoreRate);
-            section.setAvgscore(avgScore);
-            section.setPointlevel(pointlevel);
-            section.setPointid(pqvo.getPointid());
-            section.setPointname(pqvo.getPointname());
-            rtnList.add(section);
+
+            MsrSubjectPointSection sps = new MsrSubjectPointSection();
+            sps.setExamid(pointParams.getExamid());
+            sps.setSubjectid(pointParams.getSubjectid());
+            sps.setPointlevel(pointParams.getPointlevel());
+            sps.setPointid(pointParams.getPointid());
+            sps.setPointname(pointParams.getPointname());
+            sps.setFdfw(section.getFdfw());
+            if(!sectionStuPoints.isEmpty()){
+                // 获取总分
+                double sumScore = sectionStuPoints.stream().mapToDouble(PointStudentVo::getStuscore).sum();
+                int stuNum = sectionStuPoints.size();
+                // 获取平均分
+                double avgScore = MarkingUtil.div(sumScore, stuNum);
+                // 获取平均得分率
+                double avgScoreRate = MarkingUtil.calculateRate(avgScore, pointParams.getFullscore());
+                sps.setAvgrate(avgScoreRate);
+                sps.setAvgscore(avgScore);
+            }else{
+                sps.setAvgrate(0.0);
+                sps.setAvgscore(0.0);
+            }
+
+            rtnList.add(sps);
         }
         return rtnList;
     }
@@ -294,8 +318,6 @@ public class ReportGeneratePointService {
         List<RankGroupVo> rankGroups = MarkingUtil.rankGroup(totalRank,7);
         //获取知识点分段,1分1段
         List<RankGroupVo> sectionScores = MarkingUtil.fdScore(pqvo.getScore(),5);
-
-
         List<MsrSubjectPointRankgroup> rtnList = new ArrayList<>();
         for (RankGroupVo rankGroup : rankGroups) {
             //名次下学生信息
@@ -341,6 +363,7 @@ public class ReportGeneratePointService {
                     }else{
                         sectionStuQuestions = groupStuPoints.stream().filter(q -> q.getStuscore() >= sectionScore.getMinvalue() && q.getStuscore() < sectionScore.getMaxvalue()).collect(Collectors.toList());
                     }
+
                     sqrg.setStunum(sectionStuQuestions.size());
                     sqrg.setStuids(sectionStuQuestions.stream().map(q -> q.getStudentid().toString()).collect(Collectors.joining(",")));
                 }else{
@@ -373,8 +396,9 @@ public class ReportGeneratePointService {
             topPoint.setPointname(point.getPointname());
 
             //获取知识点的详细信息
-            if(pointMap.containsKey(point.getPointid())){
+            if(pointMap.containsKey(point.getPointid()) && pointMap.get(point.getPointid()).getPointpid()!= null){
                 PointVo pointVo = pointMap.get(point.getPointid());
+                //说明知识点的上层知识点不为空
                 PointVo parentNode =pointVo.getParent(points);//上层知识点
                 upPoint.setTopPointid(parentNode.getPointid());
                 upPoint.setTopPointname(parentNode.getPointname());
@@ -389,6 +413,7 @@ public class ReportGeneratePointService {
                     topPoint.setTopPointname(point.getPointname());
                 }
             }else{
+                //知识点的父知识点为空，即上层、顶层知识点都是知识点本身
                 upPoint.setTopPointid(point.getPointid());
                 upPoint.setTopPointname(point.getPointname());
 
@@ -452,17 +477,20 @@ public class ReportGeneratePointService {
     private void pointTopAndUpForOther(List<PointStudentVo> levelStuPoints, List<QuestionPointVo> ques, Map<Integer,String> qnMap, PointParams pointParam,
                                         List<MsClassStudent> classStus, List<MsrSubjectPointSection> pointSections, List<MsrStudent> sturanks,List<MsrStudentPoint> saveStuPoints,
                                         List<MsrSubjectPoint> saveSubjectPoints, List<MsrSubjectPointSection> savePointSections, List<MsrSubjectPointRankgroup> savePointRankgroups){
+        List<Integer> mptqids = new ArrayList<>();
+        for(QuestionPointVo qpointvo : ques){
+            mptqids.addAll(qpointvo.getMptqids());
+        }
 
-        List<Integer> mptqids = ques.stream().map(QuestionPointVo::getMptqid).distinct().collect(Collectors.toList());
-        String qnStr="";
+        StringBuilder qnStr= new StringBuilder();
         String mptqidStr = mptqids.stream().map(Object::toString).collect(Collectors.joining(","));
         for(Map.Entry<Integer,String> qnentry : qnMap.entrySet()){
             if(mptqids.contains(qnentry.getKey())){
-                qnStr = qnStr + qnentry.getValue() + ",";
+                qnStr.append(qnentry.getValue()).append(",");
             }
         }
-        if(N_Utils.isNotEmpty(qnStr)){
-            qnStr = qnStr.substring(0,qnStr.length()-1);
+        if(N_Utils.isNotEmpty(qnStr.toString())){
+            qnStr = new StringBuilder(qnStr.substring(0, qnStr.length() - 1));
         }
 
         //知识点多个试题，处理成单个学生试题总分值
@@ -484,12 +512,12 @@ public class ReportGeneratePointService {
         subjectPoint.setExamid(pointParam.getExamid());
         subjectPoint.setSubjectid(pointParam.getSubjectid());
         subjectPoint.setPointid(pointParam.getPointid());
+        subjectPoint.setPointname(pointParam.getPointname());
         subjectPoint.setClassid(0);
-        subjectPoint.setPointname(pointParam.getPointid());
         subjectPoint.setFullscore(pointParam.getFullscore());
         subjectPoint.setPointlevel(pointParam.getPointlevel());
         subjectPoint.setMptqids(mptqidStr);
-        subjectPoint.setQns(qnStr);
+        subjectPoint.setQns(qnStr.toString());
 
         //校知识点分析
         MsrSubjectPoint schoolPoint = pointLevelClass(pointStuScores, subjectPoint);
@@ -522,7 +550,7 @@ public class ReportGeneratePointService {
         pqvo.setScore(pointParam.getFullscore());
 
         //知识点分段分析(知识点与总分的相关性)
-        List<MsrSubjectPointSection> pointSecs = pointSection(pointStuScores, pointSections, pqvo, pointParam.getPointlevel());
+        List<MsrSubjectPointSection> pointSecs = pointSection(pointStuScores, pointSections, pointParam);
         savePointSections.addAll(pointSecs);
 
         //知识点考生分组分析
@@ -547,7 +575,7 @@ public class ReportGeneratePointService {
                 stuPoint.setSturate(MarkingUtil.calculateRate(pstuvo.getStuscore(), pqvo.getScore()));
                 stuPoint.setSchoolavg(schoolAvgScore);
                 stuPoint.setSchoolrate(schoolScoreRate);
-                stuPoint.setQns(qnStr);
+                stuPoint.setQns(qnStr.toString());
                 stuPoint.setMptqid(mptqidStr);
                 saveStuPoints.add(stuPoint);
             }
@@ -673,8 +701,8 @@ public class ReportGeneratePointService {
                 pqvo.setScore(pointscore);
 
                 //知识点结构与总分的相关性(三级知识点)
-                List<MsrSubjectPointSection> pointSecs = pointSection(pointStuScores, pointSections, pqvo, pointlevel);
-                savePointSections.addAll(pointSecs);
+                // List<MsrSubjectPointSection> pointSecs = pointSection(pointStuScores, pointSections, PointParams);
+                // savePointSections.addAll(pointSecs);
 
                 //知识点考生分组分析
                 List<MsrSubjectPointRankgroup> pointRankg = pointRankGroup(pointStuScores,sturanks, pqvo, examid, subjectid, pointlevel);

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

@@ -31,6 +31,7 @@ import com.xhkjedu.smarking.vo.report.reportother.SzJsonVo;
 import com.xhkjedu.smarking.vo.report.reportsubject.SectionScoreVo;
 import com.xhkjedu.utils.N_Utils;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
 import java.util.*;
@@ -70,6 +71,7 @@ public class ReportGenerateQuestionService {
     @Resource
     private ReportGeneratePointService reportGeneratePointService;
 
+    @Transactional(rollbackFor = Exception.class)
     public void generateQuestion(Integer examid, Integer exammode) {
         // 查询所有学生试题
         List<MsPaperStudentQuestion> stuQuestions = msPaperStudentQuestionMapper.listAllStuQuesByExamid(examid);
@@ -79,6 +81,8 @@ public class ReportGenerateQuestionService {
         // 获取考试参数
         List<MsrReportparam> params = msrReportparamMapper.listReportparamByRpbelong(examid, "quesummary", null);
 
+        msrClassQuestionMapper.deleteReportByExamid(examid);//清除数据
+
         // 根据科目进行区分
         for (MsPaper subject : subjects) {
             String subjectid = subject.getSubjectid();
@@ -94,6 +98,8 @@ public class ReportGenerateQuestionService {
             // 获取学生科目得分及排名
             List<MsrStudent> subjectStuPapers = stuPapers.stream().filter(p -> p.getSubjectid().equals(subjectid)).collect(Collectors.toList());
 
+            // 处理学生客观题、主观题得分
+            handleStudentObjSub(subjectStuQuestions, subjectStuPapers, questions);
             // 处理小题
             handleQuestion(subjectStuQuestions, subjectClassStudents, questions, subjectParams, subjectStuPapers, examid, subjectid,subject.getPscore());
             //处理题型
@@ -101,8 +107,36 @@ public class ReportGenerateQuestionService {
             //客观题、主观题
             handleObjSub(subjectStuQuestions, subjectClassStudents, questions, subjectStuPapers, examid, subjectid,subject.getPscore());
             //知识点相关分析
-            reportGeneratePointService.generatePoint(subjectStuQuestions,questions,classStudents,stuPapers,examid,subjectid,subject.getMpid(),subject.getPscore());
+            reportGeneratePointService.generatePoint(subjectStuQuestions,questions,classStudents,subjectStuPapers,examid,subjectid,subject.getMpid(),subject.getPscore());
+        }
+    }
+
+    //学生客观题、主观题得分
+    private void handleStudentObjSub(List<MsPaperStudentQuestion> subjectStuQuestions, List<MsrStudent> stus, List<MsPaperQtypeQuestion> questions){
+        //获取试卷中所有主观题、客观题
+        List<Integer> objMptqids = questions.stream().filter(q -> q.getQtype()==1).map(MsPaperQtypeQuestion::getMptqid).distinct().collect(Collectors.toList());
+        List<Integer> subMptqids = questions.stream().filter(q -> q.getQtype()==2).map(MsPaperQtypeQuestion::getMptqid).distinct().collect(Collectors.toList());
+        //学生试题按学生分组
+        Map<Integer,List<MsPaperStudentQuestion>> stuQuestionMap = subjectStuQuestions.stream().collect(Collectors.groupingBy(MsPaperStudentQuestion::getStudentid));
+
+        for(MsrStudent stu:stus){
+            Integer studentid = stu.getStudentid();
+            if(stuQuestionMap.containsKey(studentid)){
+                List<MsPaperStudentQuestion> stuQuestions = stuQuestionMap.get(studentid);
+                List<MsPaperStudentQuestion> objStuQues = stuQuestions.stream().filter(q -> objMptqids.contains(q.getMptqid())).collect(Collectors.toList());
+                List<MsPaperStudentQuestion> subStuQues = stuQuestions.stream().filter(q -> subMptqids.contains(q.getMptqid())).collect(Collectors.toList());
+                //学生客观题得分
+                double objScore = objStuQues.stream().mapToDouble(MsPaperStudentQuestion::getStuscore).sum();
+                //学生主观题得分
+                double subScore = subStuQues.stream().mapToDouble(MsPaperStudentQuestion::getStuscore).sum();
+                stu.setObjscore(N_Utils.formatDouble(objScore,1));
+                stu.setSubscore(N_Utils.formatDouble(subScore,1));
+            }else{
+                stu.setObjscore(0.0);
+                stu.setSubscore(0.0);
+            }
         }
+        msrStudentMapper.updateBatchObjSubScore(stus);
     }
 
     // 单个试题分析
@@ -139,6 +173,7 @@ public class ReportGenerateQuestionService {
             schoolQ.setSchoolavgscore(avgScore);
             schoolQ.setSchoolavgrate(avgScoreRate);
             schoolQ.setMptqid(question.getMptqid());
+            schoolQ.setZqda(question.getQanswer());
             schoolQ.setQn(question.getMptqn() + "." + question.getQn());
             // 全校班级试题情况
             MsrClassQuestion schoolQue = questionClass(stuQuestions, question, params, schoolQ);
@@ -238,7 +273,7 @@ public class ReportGenerateQuestionService {
 
         classQ.setScorerate(stuScoreRate);
         classQ.setScoreratec(MarkingUtil.sub(MarkingUtil.calculateRate(maxScore, qScore), MarkingUtil.calculateRate(minScore, qScore)));// 得分率差=最高得分率-最低得分率
-        classQ.setNd(MarkingUtil.div(stuScoreRate, qScore));// 难度
+        classQ.setNd(MarkingUtil.div(avgScore, qScore));// 难度
         String[] ndStr = questionNdAndQfd(params, 1, classQ.getNd());
         classQ.setNdms(ndStr[0]);// 难度描述
         classQ.setNdfw(ndStr[1]);// 难度范围
@@ -248,19 +283,32 @@ public class ReportGenerateQuestionService {
         classQ.setQfdfw(qfdStr[1]);// 区分度范围
         classQ.setBzc(MarkingUtil.bzc(stuScores));// 标准差
         classQ.setCyxs(MarkingUtil.div(classQ.getBzc(), avgScore));// 差异系数
-        classQ.setJbzs(MarkingUtil.jbzs(stuScores, stuScoreRate));// 鉴别指数
+        classQ.setJbzs(MarkingUtil.jbzs(stuScores, question.getQscore()));// 鉴别指数
+        classQ.setZqda(schoolQ.getZqda());
         // 获取所有满分学生
         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
-        classQ.setMfnum(fullStuQuestions.size());
-        classQ.setMfrate(MarkingUtil.calculateRate(classQ.getMfnum(), stunum));////正确率、满分人数占比
-        classQ.setMfids(mfids);
+        if(!fullStuQuestions.isEmpty()){
+            String mfids = fullStuQuestions.stream().map(p -> p.getStudentid().toString()).collect(Collectors.joining(","));// 满分学生id
+            classQ.setMfnum(fullStuQuestions.size());
+            classQ.setMfrate(MarkingUtil.calculateRate(classQ.getMfnum(), stunum));////正确率、满分人数占比
+            classQ.setMfids(mfids);
+        }else{
+            classQ.setMfnum(0);
+            classQ.setMfrate(0.0);////正确率、满分人数占比
+        }
+        classQ.setZqrate(classQ.getMfrate());
+
         // 获取零分学生
         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.calculateRate(lfStuQuestions.size(), stunum));////零分人数占比
-        classQ.setLfids(lfids);
+        if (!lfStuQuestions.isEmpty()) {
+            String lfids = lfStuQuestions.stream().map(p -> p.getStudentid().toString()).collect(Collectors.joining(","));// 零分学生id
+            classQ.setLfnum(lfStuQuestions.size());
+            classQ.setLfrate(MarkingUtil.calculateRate(lfStuQuestions.size(), stunum));////零分人数占比
+            classQ.setLfids(lfids);
+        } else {
+            classQ.setLfnum(0);
+            classQ.setLfrate(0.0);////零分人数占比
+        }
         return classQ;
     }
 
@@ -397,12 +445,18 @@ public class ReportGenerateQuestionService {
                     }else{
                         sectionStuQuestions = groupStuQuestions.stream().filter(q -> q.getStuscore() >= sectionScore.getMinvalue() && q.getStuscore() < sectionScore.getMaxvalue()).collect(Collectors.toList());
                     }
-                    double sectionStuSumScore = sectionStuQuestions.stream().mapToDouble(MsPaperStudentQuestion::getStuscore).sum();
-                    double sectionStuAvgScore = MarkingUtil.div(sectionStuSumScore, sectionStuQuestions.size());
-                    sqrg.setStunum(sectionStuQuestions.size());
-                    sqrg.setStuids(sectionStuQuestions.stream().map(q -> q.getStudentid().toString()).collect(Collectors.joining(",")));
-                    sqrg.setScorerate(MarkingUtil.calculateRate(sectionStuSumScore, sectionStuQuestions.size() * fullScore));
-                    sqrg.setAvgrate(MarkingUtil.calculateRate(sectionStuAvgScore, fullScore));
+                    if(!sectionStuQuestions.isEmpty()){
+                        double sectionStuSumScore = sectionStuQuestions.stream().mapToDouble(MsPaperStudentQuestion::getStuscore).sum();
+                        double sectionStuAvgScore = MarkingUtil.div(sectionStuSumScore, sectionStuQuestions.size());
+                        sqrg.setStunum(sectionStuQuestions.size());
+                        sqrg.setStuids(sectionStuQuestions.stream().map(q -> q.getStudentid().toString()).collect(Collectors.joining(",")));
+                        sqrg.setScorerate(MarkingUtil.calculateRate(sectionStuSumScore, sectionStuQuestions.size() * fullScore));
+                        sqrg.setAvgrate(MarkingUtil.calculateRate(sectionStuAvgScore, fullScore));
+                    }else{
+                        sqrg.setStunum(0);
+                        sqrg.setScorerate(0.0);
+                        sqrg.setAvgrate(0.0);
+                    }
                 }else{
                     sqrg.setStunum(0);
                     sqrg.setScorerate(0.0);
@@ -419,10 +473,10 @@ public class ReportGenerateQuestionService {
                 }
                 List<String> newOptions = options.stream().map(s -> s != null && !s.isEmpty() ? s : "未作答").sorted().collect(Collectors.toList());
                 for(String optionStr : newOptions){
-
                     MsrSubjectQuestionRankgroup optionObj = new MsrSubjectQuestionRankgroup();
                     optionObj.setExamid(examid);
                     optionObj.setSubjectid(subjectid);
+                    optionObj.setMptqid(mptqid);
                     optionObj.setQntype(1);
                     optionObj.setRgroup(rankGroup.getGroupname());
                     optionObj.setRgtype(1);
@@ -436,13 +490,20 @@ public class ReportGenerateQuestionService {
                             optionStuQuestions = groupStuQuestions.stream().filter(q -> optionStr.equals(q.getStuanswer())).collect(Collectors.toList());
                         }
 
-                        double optionStuSumScore = optionStuQuestions.stream().mapToDouble(MsPaperStudentQuestion::getStuscore).sum();
-                        double optionStuAvgScore = MarkingUtil.div(optionStuSumScore, optionStuQuestions.size());
+                        if(!optionStuQuestions.isEmpty()){
+                            double optionStuSumScore = optionStuQuestions.stream().mapToDouble(MsPaperStudentQuestion::getStuscore).sum();
+                            double optionStuAvgScore = MarkingUtil.div(optionStuSumScore, optionStuQuestions.size());
+
+                            optionObj.setStunum(optionStuQuestions.size());
+                            optionObj.setStuids(optionStuQuestions.stream().map(q -> q.getStudentid().toString()).collect(Collectors.joining(",")));
+                            optionObj.setScorerate(MarkingUtil.calculateRate(optionStuSumScore, optionStuQuestions.size() * fullScore));
+                            optionObj.setAvgrate(MarkingUtil.calculateRate(optionStuAvgScore, fullScore));
+                        }else{
+                            optionObj.setStunum(0);
+                            optionObj.setScorerate(0.0);
+                            optionObj.setAvgrate(0.0);
+                        }
 
-                        optionObj.setStunum(optionStuQuestions.size());
-                        optionObj.setStuids(optionStuQuestions.stream().map(q -> q.getStudentid().toString()).collect(Collectors.joining(",")));
-                        optionObj.setScorerate(MarkingUtil.calculateRate(optionStuSumScore, optionStuQuestions.size() * fullScore));
-                        optionObj.setAvgrate(MarkingUtil.calculateRate(optionStuAvgScore, fullScore));
                     }else{
                         optionObj.setStunum(0);
                         optionObj.setScorerate(0.0);
@@ -491,22 +552,36 @@ public class ReportGenerateQuestionService {
             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());
+
+            MsrSubjectQuestionSection sqs = new MsrSubjectQuestionSection();
+            sqs.setExamid(section.getExamid());
+            sqs.setSubjectid(section.getSubjectid());
+            sqs.setMptqid(mptqid);
+            sqs.setFdfw(section.getFdfw());
+            sqs.setFdnum(section.getFdnum());
+            sqs.setFdids(section.getFdids());
             // 获取总分
-            double sumScore = sectionStuQuestions.stream().mapToDouble(MsPaperStudentQuestion::getStuscore).sum();
-            int stuNum = sectionStuQuestions.size();
-            // 获取平均分
-            double avgScore = MarkingUtil.div(sumScore, stuNum);
-            // 获取平均得分率
-            double avgScoreRate = MarkingUtil.calculateRate(avgScore, fullScore);
-            section.setAvgscore(avgScore);
-            section.setAvgrate(avgScoreRate);
+            if(!sectionStuQuestions.isEmpty()){
+                int stuNum = sectionStuQuestions.size();
+                // 获取总分
+                double sumScore = sectionStuQuestions.stream().mapToDouble(MsPaperStudentQuestion::getStuscore).sum();
+                // 获取平均分
+                double avgScore = MarkingUtil.div(sumScore, stuNum);
+                // 获取平均得分率
+                double avgScoreRate = MarkingUtil.calculateRate(avgScore, fullScore);
+                sqs.setAvgscore(avgScore);
+                sqs.setAvgrate(avgScoreRate);
+            }else{
+                sqs.setAvgscore(0.0);
+                sqs.setAvgrate(0.0);
+            }
+
             if(qtype == 1){
-                section.setQntype(qtype);//类型1小题2客观题3主观题
+                sqs.setQntype(qtype);//类型1小题2客观题3主观题
             }else{
-                section.setQntype(qtype+1);
+                sqs.setQntype(qtype+1);
             }
-            section.setMptqid(mptqid);
-            rtnList.add(section);
+            rtnList.add(sqs);
         }
         return rtnList;
     }
@@ -592,9 +667,9 @@ public class ReportGenerateQuestionService {
         classQtype.setAvgscore(avgScore);
         classQtype.setBzc(MarkingUtil.bzc(stuScores));
         classQtype.setNd(MarkingUtil.div(avgScore, schoolQtype.getFullscore()));
-        classQtype.setNdms(questionNdAndQfd(params, 1, schoolQtype.getNd())[0]);
+        classQtype.setNdms(questionNdAndQfd(params, 1, classQtype.getNd())[0]);
         classQtype.setQfd(MarkingUtil.qfd(stuScores));
-        classQtype.setQfdms(questionNdAndQfd(params, 2, schoolQtype.getQfd())[0]);
+        classQtype.setQfdms(questionNdAndQfd(params, 2, classQtype.getQfd())[0]);
         classQtype.setMfnum(mfnum);
         classQtype.setMfrate(MarkingUtil.calculateRate(mfnum, stuNum));
         if(mfnum > 0){
@@ -644,8 +719,7 @@ public class ReportGenerateQuestionService {
             List<MsrSubjectQuestionSection> sectionQuestions = subjectSectionQuestion(stuQuestions, subjectSectionQuestions,entry.getKey(), fullScore,null);
             saveSectionQuestions.addAll(sectionQuestions);
 
-
-            Integer qobjsubtype;//为了区分表中存放值
+            int qobjsubtype;//为了区分表中存放值
             if(entry.getKey() == 1){
                 qobjsubtype = 11;
             }else{
@@ -700,12 +774,12 @@ public class ReportGenerateQuestionService {
 
         Double stuSumScore = stuQuestions.stream().mapToDouble(MsPaperStudentQuestion::getStuscore).sum();// 学生总分
         Double avgScore = MarkingUtil.div(stuSumScore, stuNum);// 平均分
-        Double stuScoreRate = MarkingUtil.div(stuSumScore, schoolObjsub.getFullscore() * stuNum);// 学生得分率
 
         MsrClassQobjsub objSub = new MsrClassQobjsub();
         objSub.setExamid(schoolObjsub.getExamid());
         objSub.setSubjectid(schoolObjsub.getSubjectid());
         objSub.setClassid(schoolObjsub.getClassid());
+        objSub.setStunum(stuNum);
         objSub.setQtype(schoolObjsub.getQtype());
         objSub.setFullscore(schoolObjsub.getFullscore());
         objSub.setMaxscore(stuScores.stream().max(Double::compareTo).orElse(0.0));
@@ -716,7 +790,7 @@ public class ReportGenerateQuestionService {
         objSub.setQfd(MarkingUtil.qfd(stuScores));
         objSub.setBzc(MarkingUtil.bzc(stuScores));
         objSub.setCyxs(MarkingUtil.div(objSub.getBzc(), avgScore));
-        objSub.setJbzs(MarkingUtil.jbzs(stuScores, stuScoreRate));
+        objSub.setJbzs(MarkingUtil.jbzs(stuScores, schoolObjsub.getFullscore()));
         objSub.setMfnum(mfnum);
         objSub.setMfrate(MarkingUtil.calculateRate(mfnum, stuNum));
         if(mfnum > 0){

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

@@ -389,8 +389,8 @@ public class MarkingUtil {
         if (N_Utils.isListEmpty(x)) return 0;
         int m = x.size();
         double sum = 0;
-        for (int i = 0; i < m; i++) {// 求和
-            sum += x.get(i);
+        for (Double aDouble : x) {// 求和
+            sum += aDouble;
         }
         double dAve = sum / m;// 求平均值
         double dVar = 0;
@@ -430,6 +430,7 @@ public class MarkingUtil {
         if (N_Utils.isListEmpty(scores)) return 0;
 
         int totalCount = scores.size();
+        Collections.sort(scores);//对集合排序
         int highCount = (int) Math.ceil(totalCount * 0.27); // 高分组人数
         int lowCount = (int) Math.ceil(totalCount * 0.27);  // 低分组人数
 
@@ -520,20 +521,23 @@ public class MarkingUtil {
 
     // 鉴别指数 试题鉴别指数 = 前27%的学生得分率-后27%的学生得分率
     // 将学生按总分排序（去掉缺考的学生），取前27%、后27%的学生，分别计算在该题上的得分率，两者之差即为鉴别指数
-    public static double jbzs(List<Double> list, Double scoreRate) {
+    public static double jbzs(List<Double> list, Double qscore) {
         List<Double> sortList = list.stream().sorted().collect(Collectors.toList());
         int size = sortList.size();
-        int count = (int) (size * 0.27);// 27%学生数量
+
+        if (qscore == 0) return 0.0;
+        int highCount = (int) Math.ceil(size * 0.27); // 高分组人数
+        int lowCount = (int) Math.ceil(size * 0.27);  // 低分组人数
 
         // 前27%的学生
-        List<Double> topGroup = sortList.subList(0, count);
+        List<Double> topGroup = new ArrayList<>(sortList.subList(size - highCount, size));
         double topScore = topGroup.stream().mapToDouble(Double::doubleValue).sum();
-        double topRate = div(topScore, mul(scoreRate, count));
+        double topRate = div(topScore, mul(qscore, highCount));
 
         // 后27%的学生
-        List<Double> bottomGroup = sortList.subList(size - count, size);
+        List<Double> bottomGroup = new ArrayList<>(sortList.subList(0, lowCount));
         double bottomScore = bottomGroup.stream().mapToDouble(Double::doubleValue).sum();
-        double bottomRate = div(bottomScore, mul(scoreRate, count));
+        double bottomRate = div(bottomScore, mul(qscore, lowCount));
 
         // 鉴别指数
         return sub(topRate, bottomRate);
@@ -578,7 +582,7 @@ public class MarkingUtil {
     //分数排名
     public static Map<Double,Integer> fspm(List<Double> scores) {
         //倒序排
-        Collections.sort(scores, Collections.reverseOrder());
+        scores.sort(Collections.reverseOrder());
         // 创建一个地图来存储分数和出现次数
         Map<Double, Integer> scoreCountMap = new HashMap<>();
 
@@ -595,7 +599,7 @@ public class MarkingUtil {
     //人数排名
     public static Map<Integer,Integer> rspm(List<Integer> nums) {
         //倒序排
-        Collections.sort(nums, Collections.reverseOrder());
+        nums.sort(Collections.reverseOrder());
         // 创建一个地图来存储分数和出现次数
         Map<Integer, Integer> scoreCountMap = new HashMap<>();
 
@@ -668,15 +672,10 @@ public class MarkingUtil {
         return "";
     }
     public static void main(String[] args) {
-        // List<SectionScoreVo> rtnList = fdScoreForOne(0.8);
-        // for (SectionScoreVo rg : rtnList) {
-        //     System.out.println(rg.getSectionname() + ": " + rg.getMinvalue() + "-" + rg.getMaxvalue());
-        // }
-
-        List<String> list = Arrays.asList("A", "BC", "C", "AB", "","D");
-    List<String> rtnList = list.stream().map(s -> s != null &&!s.isEmpty() ? s : "未作答").sorted().collect(Collectors.toList());
-        for (String rtn : rtnList) {
-            System.out.println(rtn);
+        List<String> options = Arrays.asList("A","B","D","F","","C","E");
+        List<String> newOptions = options.stream().map(s -> s != null && !s.isEmpty() ? s : "未作答").sorted().collect(Collectors.toList());
+        for (String option : newOptions) {
+            System.out.println(option);
         }
     }
 }

smarking/src/main/resources/mapper/paper/MsTemplateBlockMapper.xml

@@ -15,6 +15,7 @@
         <result column="mblockid" property="mblockid" />
         <result column="blockname" property="blockname" />
         <result column="mttype" property="mttype" />
+        <result column="direct" property="direct" />
         <result column="localcoor" property="localcoor" />
         <result column="pagenum" property="pagenum" />
         <result column="extendcoor" property="extendcoor" />
@@ -28,9 +29,9 @@
             <result column="mtbqorder" property="mtbqorder" />
         </collection>
     </resultMap>
-    <!--模版信息详情-->
+    <!--模板信息详情-->
     <select id="listTemplateBlockQuestions" resultMap="templateBlockResultMap">
-        select b.mtbid,b.mblockid,b.blockname,b.mttype,b.localcoor,b.pagenum,b.extendcoor,b.scorecoor,
+        select b.mtbid,b.mblockid,b.blockname,b.mttype,b.direct,b.localcoor,b.pagenum,b.extendcoor,b.scorecoor,
         b.mtborder,q.mtbqid,q.qn,q.qlocalcoor,q.mtbqorder
         from ms_template_block b left join ms_template_block_question q on b.mtbid=q.mtbid
         where b.mtid=#{mtid}
@@ -40,9 +41,9 @@
         order by b.mtborder,q.mtbqorder
     </select>
 
-    <!--获取模版主观题题块信息-->
+    <!--获取模板主观题题块信息-->
     <select id="listSubjectiveBlockQuestions" resultType="java.util.Map">
-        select b.mtbid,b.mblockid,b.blockname,b.mttype,b.localcoor,b.pagenum,b.extendcoor,b.scorecoor,
+        select b.mtbid,b.mblockid,b.blockname,b.mttype,b.direct,b.localcoor,b.pagenum,b.extendcoor,b.scorecoor,
         b.mtborder from ms_template_block b where b.mtid=#{mtid} and b.mttype=2 order by b.mtborder
     </select>
 </mapper>

smarking/src/main/resources/mapper/report/reportclass/MsrClassQuestionMapper.xml

@@ -1,4 +1,18 @@
 <?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.MsrClassQuestionMapper">
+
+    <!-- 清除单次考试报告 -->
+    <delete id="deleteReportByExamid">
+        delete from msr_class_qobjsub where examid = #{examid};
+        delete from msr_class_qtype where examid = #{examid};
+        delete from msr_class_question where examid = #{examid};
+        delete from msr_class_question_obj where examid = #{examid};
+        delete from msr_student_point where examid = #{examid};
+        delete from msr_subject_point where examid = #{examid};
+        delete from msr_subject_point_section where examid = #{examid};
+        delete from msr_subject_question_rankgroup where examid = #{examid};
+        delete from msr_subject_question_section where examid = #{examid};
+    </delete>
+
 </mapper>

smarking/src/main/resources/mapper/report/reportother/MsrExamMapper.xml

@@ -1,4 +1,29 @@
 <?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.reportother.MsrExamMapper">
+
+    <!-- 清除单次考试报告 -->
+    <delete id="deleteReportByExamid">
+        delete from msr_class_goodbad where examid = #{examid};
+        delete from msr_class_nearline where examid = #{examid};
+        delete from msr_class_qobjsub where examid = #{examid};
+        delete from msr_class_qtype where examid = #{examid};
+        delete from msr_class_question where examid = #{examid};
+        delete from msr_class_question_obj where examid = #{examid};
+        delete from msr_class_rankgroup where examid = #{examid};
+        delete from msr_class_rankrate where examid = #{examid};
+        delete from msr_class_section where examid = #{examid};
+        delete from msr_class_subject where examid = #{examid};
+        delete from msr_class_subject_grade where examid = #{examid};
+        delete from msr_class_top where examid = #{examid};
+        delete from msr_exam where examid = #{examid};
+        delete from msr_student where examid = #{examid};
+        delete from msr_student_point where examid = #{examid};
+        delete from msr_subject where examid = #{examid};
+        delete from msr_subject_class where examid = #{examid};
+        delete from msr_subject_point where examid = #{examid};
+        delete from msr_subject_point_section where examid = #{examid};
+        delete from msr_subject_question_rankgroup where examid = #{examid};
+        delete from msr_subject_question_section where examid = #{examid};
+    </delete>
 </mapper>

smarking/src/main/resources/mapper/report/reportstu/MsrStudentMapper.xml

@@ -5,4 +5,11 @@
     <select id="listStuScoreAndRankByExamid" resultType="com.xhkjedu.smarking.model.report.reportstu.MsrStudent">
         select rsid,examid,subjectid,classid,studentid,stuscore,classrank,schoolrank from msr_student where examid = #{examid}
     </select>
+
+    <!--批量修改学生主观题、客观题分值-->
+    <update id="updateBatchObjSubScore">
+        <foreach collection="list" item="item" separator=";">
+            update msr_student set objscore = #{item.objscore},subscore = #{item.subscore} where rsid = #{item.rsid}
+        </foreach>
+    </update>
 </mapper>

smarking/src/main/resources/mapper/stupaper/MsPaperStudentQuestionMapper.xml

@@ -325,7 +325,7 @@
 
     <!--获取考试所有参考学生作答情况-->
     <select id="listAllStuQuesByExamid" resultType="com.xhkjedu.smarking.model.stupaper.MsPaperStudentQuestion">
-        select sq.mpsqid,sq.studentid,sq.subjectid,sq.mpid,sq.mpsid,sq.mptid,sq.mptqid,sq.ctype,sq.questionid,sq.qn,sq.qorder,
+        select sq.mpsqid,sq.studentid,sq.subjectid,sq.mpid,sq.mpsid,sq.mptqid,sq.ctype,sq.questionid,sq.qn,sq.qorder,
         sq.qscore,sq.answered,sq.answertype,sq.stuanswer,sq.stuscore,sq.stumerge,sq.hasgood,sq.hasbad
         from ms_paper_student_question sq
         left join ms_paper_student ps on sq.mpsid=ps.mpsid