试卷模版完善

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

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

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

@@ -37,10 +37,10 @@ public class MsTemplate extends BaseBean {
     private String coorfront;
     //反面定位坐标
     private String coorback;
-    //正面定位像素占比
-    private Double pxfront;
-    //反面定位像素占比
-    private String pxback;
+    //正面定位图片地址
+    private String dwtfront;
+    //反面定位图片地址
+    private String dwtback;
     //缺考标记坐标
     private String misscoor;
     //违规标记坐标

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

@@ -57,6 +57,8 @@ public class MsrClassQuestion extends BaseBean {
     private Double nd;
     //难度描述
     private String ndms;
+    //难度范围
+    private String ndfw;
     //标准差
     private Double bzc;
     //差异系数
@@ -65,6 +67,8 @@ public class MsrClassQuestion extends BaseBean {
     private Double qfd;
     //区分度描述
     private String qfdms;
+    //区分度范围
+    private String qfdfw;
     //鉴别指数
     private Double jbzs;
     //正确答案

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

@@ -0,0 +1,36 @@
+package com.xhkjedu.smarking.model.report.reportsubject;
+
+import com.xhkjedu.model.BaseBean;
+import lombok.Data;
+
+import javax.persistence.Id;
+import javax.persistence.Table;
+
+/**
+ * @Description 阅卷报告-科目区间试题得分率表
+ * @Author auto
+ * @Date 2024-12-12
+ */
+@Data
+@Table(name = "msr_subject_section_question")
+public class MsrSubjectSectionQuestion extends BaseBean {
+    @Id
+    //阅卷报告-科目区间试题得分率表
+    private Integer sqsid;
+    //考试ID
+    private Integer examid;
+    //科目ID
+    private String subjectid;
+    //试题ID
+    private Integer mptqid;
+    //分数区间范围
+    private String fdfw;
+    //区间学生数量
+    private Integer fdnum;
+    //区间学生ids
+    private String fdids;
+    //平均分
+    private Double avgscore;
+    //平均得分率
+    private Double avgscorerate;
+}

smarking/src/main/java/com/xhkjedu/smarking/service/paper/MsTemplateService.java

@@ -119,6 +119,20 @@ public class MsTemplateService {
      **/
     @Transactional(rollbackFor = Exception.class)
     public MsTemplate updateTemplate(MsTemplate msTemplate){
+
+        //定位区选择
+        if(msTemplate.getCurrstep() == 3){
+
+            SchoolCloudVo school = schoolMapper.getSchoolCloudcode(msTemplate.getMpid());
+            String savefloder = school.getCloudcode() + "/" + school.getSchoolid() + "/marking/paper/";
+            //定位区正面图片
+            String dwtfront = MarkingUtil.uploadBase64Img(msTemplate.getDwtfront(),1, savefloder);
+            msTemplate.setDwtfront(dwtfront);
+            //定位区反面图片
+            String dwtback = MarkingUtil.uploadBase64Img(msTemplate.getDwtback(),1, savefloder);
+            msTemplate.setDwtback(dwtback);
+        }
+
         //其中currstep保存时会加1，代表保存后的步骤
         msTemplateMapper.updateTemplateForCurrstep(msTemplate);
         //如果当前保存为6，则需要保存客观题信息

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

@@ -5,20 +5,26 @@ import com.xhkjedu.smarking.mapper.exam.MsClassStudentMapper;
 import com.xhkjedu.smarking.mapper.exam.MsSubjectMapper;
 import com.xhkjedu.smarking.mapper.paper.MsPaperQtypeQuestionMapper;
 import com.xhkjedu.smarking.mapper.report.reportother.MsrReportparamMapper;
+import com.xhkjedu.smarking.mapper.stupaper.MsPaperStudentMapper;
 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.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.stupaper.MsPaperStudentQuestion;
 import com.xhkjedu.smarking.utils.MarkingUtil;
 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.List;
+import java.util.Map;
 import java.util.stream.Collectors;
 
 /**
@@ -38,12 +44,15 @@ public class ReportGenerateQuestionService {
     private MsPaperQtypeQuestionMapper msPaperQtypeQuestionMapper;
     @Resource
     private MsrReportparamMapper msrReportparamMapper;
+    @Resource
+    private MsPaperStudentMapper msPaperStudentMapper;
 
     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);
 
@@ -56,8 +65,13 @@ public class ReportGenerateQuestionService {
             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());
 
-            List<MsrReportparam> subjectParams = params.stream().filter(p -> p.getRpbelong().equals(subjectid)).collect(Collectors.toList());
+            //处理小题
+            handleQuestion(subjectStuQuestions,subjectClassStudents,questions,subjectParams,examid,subjectid);
         }
     }
 
@@ -65,6 +79,7 @@ public class ReportGenerateQuestionService {
     private void handleQuestion(List<MsPaperStudentQuestion> subjectStuQuestions, List<MsClassStudent> subjectClassStudents,List<MsPaperQtypeQuestion> questions,List<MsrReportparam> params,Integer examid,String subjectid){
 
         List<MsrClassQuestion> saveQuestions = new ArrayList<>();//小题分析
+        List<MsrClassQuestionObj> saveQuestionObjs = new ArrayList<>();//小题-客观题选项分析
 
         //处理小题信息
         for(MsPaperQtypeQuestion question : questions){
@@ -72,7 +87,7 @@ public class ReportGenerateQuestionService {
             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(q -> q.getStuscore()).collect(Collectors.toList());//所有学生得分
+            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);//最低分
@@ -92,19 +107,35 @@ public class ReportGenerateQuestionService {
             saveQuestions.add(schoolQue);
 
             //班级试题--客观题选项情况
+            MsrClassQuestionObj qobj = new MsrClassQuestionObj();
+            if(question.getQtype() == 1){
+                qobj.setExamid(examid);
+                qobj.setSubjectid(subjectid);
+                qobj.setClassid(0);
+                qobj.setMptqid(question.getMptqid());
+                List<MsrClassQuestionObj> qobjList = handleQuestionXuanxiang(stuQuestions,qobj);
+                saveQuestionObjs.addAll(qobjList);
+            }
 
-
-            //处理班级情况
-            for(MsClassStudent classStudent : subjectClassStudents){
+            //班级试题分析
+            //获取所有班级
+            List<Integer> classIds = subjectClassStudents.stream().map(MsClassStudent::getClassid).distinct().collect(Collectors.toList());
+            for(Integer classid : classIds){
                 //获取班级下学生id
-                List<Integer> classStuIds = subjectClassStudents.stream().map(MsClassStudent::getStudentid).collect(Collectors.toList());
+                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);
                 saveQuestions.add(classQue);
-            }
-
 
+                //班级试题--客观题选项情况
+                if(question.getQtype() == 1) {
+                    qobj.setClassid(classid);
+                    List<MsrClassQuestionObj> qobjList = handleQuestionXuanxiang(classStuQuestions,qobj);
+                    saveQuestionObjs.addAll(qobjList);
+                }
+            }
         }
     }
 
@@ -113,7 +144,7 @@ public class ReportGenerateQuestionService {
         int stunum = stuQuestions.size();//学生数量
         Double qScore = question.getQscore();//试题分值
         Double sumQScore = question.getQscore() * stunum;//小题得分
-        List<Double> stuScores = stuQuestions.stream().map(q -> q.getStuscore()).collect(Collectors.toList());//所有学生得分
+        List<Double> stuScores = stuQuestions.stream().map(MsPaperStudentQuestion::getStuscore).collect(Collectors.toList());//所有学生得分
         Double sumStuScore = stuQuestions.stream().mapToDouble(MsPaperStudentQuestion::getStuscore).sum();//综合
 
         Double maxScore;//最高分
@@ -156,9 +187,13 @@ 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.setNdms(handleQuestionNdAndQfd(params,1,classQ.getNd()));//难度描述
+        String[] ndStr = handleQuestionNdAndQfd(params,1,classQ.getNd());
+        classQ.setNdms(ndStr[0]);//难度描述
+        classQ.setNdfw(ndStr[1]);//难度范围
         classQ.setQfd(MarkingUtil.qfd(stuScores));//区分度
-        classQ.setQfdms(handleQuestionNdAndQfd(params,2, classQ.getQfd()));//区分度描述
+        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));//鉴别指数
@@ -169,33 +204,76 @@ public class ReportGenerateQuestionService {
         classQ.setMfrate(MarkingUtil.div(classQ.getMfnum(), stunum));////正确率、满分人数占比
         classQ.setMfids(mfids);
         //获取零分学生
-        List<MsPaperStudentQuestion> lfStuQuestions = stuQuestions.stream().filter(q -> q.getStuscore().equals(0)).collect(Collectors.toList());
+        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.setLfids(lfids);
         return classQ;
     }
-
-    private String handleQuestionNdAndQfd(List<MsrReportparam> params,Integer rptype,Double nd){
+    //处理单个试题分析-试题难度、区分度
+    private String[] handleQuestionNdAndQfd(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){
             List<SzJsonVo> szList = JSON.parseArray(ndParam.getSzjson(), SzJsonVo.class);
             for (SzJsonVo sz : szList) {
                 if (nd == 1 && sz.getMaxvalue() == 1) {
                     ndms = sz.getDjkey();
+                    ndfw = "[" + sz.getMinvalue() + "~" + "1]";
                     break;
                 } else if (nd == 0 && sz.getMinvalue() == 0) {
                     ndms = sz.getDjkey();
+                    ndfw = "[0" + "~" + sz.getMaxvalue() + ")";
                     break;
                 } else if(nd >= sz.getMinvalue() && nd < sz.getMaxvalue()) {
                     ndms = sz.getDjkey();
+                    ndfw = "[" + sz.getMinvalue() + "~" + sz.getMaxvalue() + ")";
                     break;
                 }
             }
         }
-        return ndms;
+        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));
+        int totalNum = stuQuestions.size();
+        List<MsrClassQuestionObj> qobjList = new ArrayList<>();
+        for(Map.Entry<String,List<MsPaperStudentQuestion>> entry : optionMap.entrySet()){
+            String option = entry.getKey();
+            List<MsPaperStudentQuestion> optionStuQuestions = entry.getValue();
+
+            MsrClassQuestionObj qobj = new MsrClassQuestionObj();
+            qobj.setExamid(questionObj.getExamid());
+            qobj.setSubjectid(questionObj.getSubjectid());
+            qobj.setClassid(questionObj.getClassid());
+            qobj.setMptqid(questionObj.getMptqid());
+            if(N_Utils.isNotEmpty(option)){
+                qobj.setXxda(option);
+            }else{
+                qobj.setXxda("未选");
+            }
+            qobj.setXxnum(optionStuQuestions.size());
+            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);
+        }
+        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());
+            //计算分段平均分
+        }
     }
 }

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

@@ -449,7 +449,7 @@ public class MarkingUtil {
         return div(sum, scores.size());
     }
 
-    //计算占比
+    //计算占比，保留4为小数，乘以100后2位小数
     public static double calculateRate(Object v1,Object v2){
         BigDecimal b1 = new BigDecimal(v1.toString());
         BigDecimal b2 = new BigDecimal(v2.toString());
@@ -560,11 +560,6 @@ public class MarkingUtil {
         return rtnList;
     }
 
-    public static void main(String[] args) {
-        System.out.println(cjl(50, 40));
-
-    }
-
     //处于年级20%得分(v=0.2)
     public static Double cynjdf(List<Double> scores, double v) {
         if (N_Utils.isListEmpty(scores)) return 0.0;
@@ -585,4 +580,21 @@ public class MarkingUtil {
         return scoreCountMap;
     }
 
+    // 分数段 分数分段
+    public static List<int[]> fdScore(Double totalScore,int fdscore){
+        List<int[]> 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});
+        }
+        return rtnList;
+    }
+
+    public static void main(String[] args) {
+        List<int[]> rtnList = fdScore(84.0, 5);
+        for (int[] rtn : rtnList) {
+            System.out.println(rtn[0] + "-" + rtn[1]);
+        }
+    }
+
 }

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

@@ -19,7 +19,7 @@
             ,anglefront=#{t.anglefront},angleback=#{t.angleback}
         </if>
         <if test="t.currstep == 3">
-            ,coorfront=#{t.coorfront},coorback=#{t.coorback},pxfront=#{t.pxfront},pxback=#{t.pxback}
+            ,coorfront=#{t.coorfront},coorback=#{t.coorback},dwtfront=#{t.dwtfront},dwtback=#{t.dwtback}
         </if>
         <if test="t.currstep == 4">
             ,examnocoor=#{t.examnocoor},cardcoor=#{t.cardcoor}
@@ -58,8 +58,8 @@
         <result property="angleback" column="angleback"/>
         <result property="coorfront" column="coorfront"/>
         <result property="coorback" column="coorback"/>
-        <result property="pxfront" column="pxfront"/>
-        <result property="pxback" column="pxback"/>
+        <result property="dwtfront" column="dwtfront"/>
+        <result property="dwtback" column="dwtback"/>
         <result property="misscoor" column="misscoor"/>
         <result property="violatecoor" column="violatecoor"/>
         <result property="examnocoor" column="examnocoor"/>
@@ -84,7 +84,7 @@
     </resultMap>
     <select id="listTemplateBlockQueByMpid" resultMap="paperTemplate">
         select t.mtid,t.mpid,t.tsize,t.blankindex,t.anglefront,t.angleback,t.coorfront,t.coorback,
-        t.pxfront,t.pxback,t.misscoor,t.violatecoor,t.examnocoor,t.cardcoor
+        t.dwtfront,t.dwtback,t.misscoor,t.violatecoor,t.examnocoor,t.cardcoor
         ,tb.mtbid,tb.mblockid,tb.mttype,tb.mtborder,tb.localcoor,tb.pagenum,tb.extendcoor,tb.scorecoor
         ,q.mtbqid,q.qn,q.mptqid,q.qlocalcoor,q.mtbqorder
         from ms_template t left join ms_template_block tb on t.mtid=tb.mtid

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

@@ -0,0 +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>