Merge remote-tracking branch 'origin/ywx' into wn

smarking/src/main/java/com/xhkjedu/smarking/mapper/stupaper/MsPaperStudentQuestionMapper.java

@@ -5,6 +5,8 @@ import com.xhkjedu.smarking.model.paper.MsPaperQtypeQuestion;
 import com.xhkjedu.smarking.model.stupaper.MsPaperStudentBlock;
 import com.xhkjedu.smarking.model.stupaper.MsPaperStudentQuestion;
 import com.xhkjedu.smarking.model.stupaper.MsPaperStudentQuestionScore;
+import com.xhkjedu.smarking.vo.paper.SQScoreVo;
+import com.xhkjedu.smarking.vo.paper.SQuestionVo;
 import com.xhkjedu.smarking.vo.stupaper.QuestionAnswerVo;
 import org.apache.ibatis.annotations.Param;
 
@@ -65,4 +67,7 @@ public interface MsPaperStudentQuestionMapper extends TkMapper<MsPaperStudentQue
 
     //获取考试所有参考学生作答情况
     List<MsPaperStudentQuestion> listAllStuQuesByExamid(@Param("examid") Integer examid);
+
+    //获取参与统计科目单题得分情况
+    List<SQScoreVo> listByMpIds(@Param("mpids") List<Integer> mpids);
 }

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

@@ -3,8 +3,8 @@ package com.xhkjedu.smarking.model.report.reportsubject;
 import com.xhkjedu.model.BaseBean;
 import lombok.Data;
 
-import javax.persistence.Id;
-import javax.persistence.Table;
+import javax.persistence.*;
+import java.util.List;
 
 /**
  * @Description 阅卷报告-科目分析表
@@ -65,4 +65,10 @@ public class MsrSubject extends BaseBean {
     private Double lsscore;
     //处于年级80%得分
     private Double bsscore;
+    @Transient
+    //每题方差
+    private List<Double> mtfc;
+    @Transient
+    //总分方差
+    private Double zffc;
 }

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

@@ -9,6 +9,7 @@ import com.xhkjedu.smarking.mapper.report.reportstu.MsrStudentMapper;
 import com.xhkjedu.smarking.mapper.report.reportsubject.MsrSubjectClassMapper;
 import com.xhkjedu.smarking.mapper.report.reportsubject.MsrSubjectMapper;
 import com.xhkjedu.smarking.mapper.stupaper.MsPaperStudentMapper;
+import com.xhkjedu.smarking.mapper.stupaper.MsPaperStudentQuestionMapper;
 import com.xhkjedu.smarking.model.exam.*;
 import com.xhkjedu.smarking.model.paper.MsPaper;
 import com.xhkjedu.smarking.model.report.reportclass.*;
@@ -18,6 +19,8 @@ import com.xhkjedu.smarking.model.report.reportstu.MsrStudent;
 import com.xhkjedu.smarking.model.report.reportsubject.MsrSubject;
 import com.xhkjedu.smarking.model.report.reportsubject.MsrSubjectClass;
 import com.xhkjedu.smarking.utils.MarkingUtil;
+import com.xhkjedu.smarking.vo.paper.SQScoreVo;
+import com.xhkjedu.smarking.vo.paper.SQuestionVo;
 import com.xhkjedu.smarking.vo.report.reportclass.ClassTopVo;
 import com.xhkjedu.smarking.vo.report.reportclass.RankRateGroupVo;
 import com.xhkjedu.smarking.vo.report.reportother.*;
@@ -49,6 +52,8 @@ public class MsrExamService {
     @Resource
     private MsPaperStudentMapper paperStudentMapper;
     @Resource
+    private MsPaperStudentQuestionMapper paperStudentQuestionMapper;
+    @Resource
     private MsrSubjectMapper msrSubjectMapper;
     @Resource
     private MsrStudentMapper msrStudentMapper;
@@ -101,7 +106,7 @@ public class MsrExamService {
         Integer classnum = N_Utils.obj2Int(classes.stream().map(MsClass::getClassid).distinct().count());
 
         //科目分析
-        Map<String, MsrSubject> subjectMap = saveSubject(examid, paperStudents, subjects);
+        Map<String, MsrSubject> subjectMap = saveSubject(examid, paperStudents, subjects, mpids);
 
         //学生成绩分析
         List<MsrStudent> msrStudents = saveStudent(examid, subjects, paperStudents, students, subjectMap);
@@ -265,7 +270,7 @@ public class MsrExamService {
 
     //保存科目分析
     public Map<String, MsrSubject> saveSubject(Integer examid, List<MsrStudent> paperStudents
-            , List<MsPaper> subjects) {
+            , List<MsPaper> subjects, List<Integer> mpids) {
         double fullscore = subjects.stream().mapToDouble(MsPaper::getPscore).sum();
         String subjectid;
         //科目分析
@@ -293,6 +298,20 @@ public class MsrExamService {
             student.setSstate(sstate);
             studentList.add(student);
         }
+        List<SQScoreVo> questionScores = paperStudentQuestionMapper.listByMpIds(mpids);//获取参与统计科目单题得分情况
+        List<Double> zfmtfc = new ArrayList<>();
+        Map<String, List<Double>> dkMtfc = new HashMap<>();
+        for (SQScoreVo s : questionScores) {
+            List<Double> mtfc = new ArrayList<>();
+            List<SQuestionVo> questions = s.getQuestions();
+            for (SQuestionVo question : questions) {
+                double fc = MarkingUtil.fc(question.getStuscores());
+                zfmtfc.add(fc);
+                mtfc.add(fc);
+            }
+            dkMtfc.put(s.getSubjectid(), mtfc);
+        }
+        msrSubject.setMtfc(zfmtfc);
         setSubject(msrSubject, studentList);
         msrSubjects.add(msrSubject);
         subjectMap.put(subjectid, msrSubject);
@@ -308,6 +327,7 @@ public class MsrExamService {
             msrSubject.setSubjectname(subject.getSubjectname());
             msrSubject.setFullscore(subject.getPscore());
             studentList = subjectCollect.get(subjectid);
+            msrSubject.setMtfc(dkMtfc.get(subjectid));
             setSubject(msrSubject, studentList);
             msrSubjects.add(msrSubject);
             subjectMap.put(subjectid, msrSubject);
@@ -317,6 +337,14 @@ public class MsrExamService {
         for (MsrSubject subject : msrSubjects) {
             subject.setAvgrank(fspm.get(subject.getAvgscore()));
             subject.setAvgrankrate(MarkingUtil.div(subject.getAvgrank(), subject.getTotalnum()));
+            String subjectid1 = subject.getSubjectid();
+            int pnum;//试卷中的题目总数
+            if ("zf".equals(subjectid1)) {
+                pnum = subjects.stream().mapToInt(MsPaper::getPnum).sum();
+            } else {
+                pnum = subjects.stream().filter(s -> s.getSubjectid().equals(subjectid1)).findFirst().get().getPnum();
+            }
+            subject.setAxdxs(MarkingUtil.axdxs(pnum, subject.getMtfc(), subject.getZffc()));
         }
         msrSubjectMapper.insertList(msrSubjects);
         return subjectMap;
@@ -1382,6 +1410,7 @@ public class MsrExamService {
         List<Double> scores = studentList.stream().map(MsrStudent::getStuscore).sorted().collect(Collectors.toList());
         double bzc = MarkingUtil.bzc(scores);
         msrSubject.setBzc(bzc);
+        msrSubject.setZffc(MarkingUtil.fc(scores));
         msrSubject.setCyxs(N_Utils.getDoubleDivideAndMulitiply(bzc, avgscore));
         msrSubject.setNd(MarkingUtil.div(avgscore, fullscore));
         msrSubject.setQfd(MarkingUtil.qfd(scores));

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

@@ -785,6 +785,20 @@ public class MarkingUtil {
         }
     }
 
+    //α信度系数=(k/(k-1))*(1-(∑Si²)/ST²
+    public static double axdxs(int k, List<Double> a, double b) {
+        if (k <= 1 || b == 0) {
+            throw new ArithmeticException("Division by zero is not allowed.");
+        }
+
+        double sumA = 0;
+        for (double value : a) {
+            sumA = MarkingUtil.add(sumA, value);
+        }
+
+        return N_Utils.formatDouble((k / (k - 1)) * (1 - (sumA / b)), 2);
+    }
+
     public static void main(String[] args) {
        List<RankGroupVo> list = fdScore(1.0,5);
        for (RankGroupVo rgvo : list) {

smarking/src/main/java/com/xhkjedu/smarking/vo/paper/SQScoreVo.java

@@ -0,0 +1,18 @@
+package com.xhkjedu.smarking.vo.paper;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ *@Description
+ *@Author ywx
+ *Date 2025/1/2 15:19
+ **/
+@Data
+public class SQScoreVo {
+    //科目ID
+    private String subjectid;
+    private List<SQuestionVo> questions;
+}
+

smarking/src/main/java/com/xhkjedu/smarking/vo/paper/SQuestionVo.java

@@ -0,0 +1,18 @@
+package com.xhkjedu.smarking.vo.paper;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ *@Description
+ *@Author ywx
+ *Date 2025/1/2 15:23
+ **/
+@Data
+public class SQuestionVo {
+    //考试试题表id
+    private Integer mptqid;
+    //学生分值
+    private List<Double> stuscores;
+}

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

@@ -331,4 +331,18 @@
         left join ms_paper_student ps on sq.mpsid=ps.mpsid
         where sq.examid=#{examid} and ps.sstate=2 order by sq.mpid,sq.studentid
     </select>
+    <!--获取参与统计科目单题得分情况-->
+    <resultMap id="subjectScore" type="com.xhkjedu.smarking.vo.paper.SQScoreVo">
+        <result column="subjectid" property="subjectid"/>
+        <collection property="questions" ofType="com.xhkjedu.smarking.vo.paper.SQuestionVo" javaType="java.util.List">
+            <result column="mptqid" property="mptqid"/>
+            <collection property="stuscores" ofType="java.lang.Double" javaType="java.util.List">
+                <result column="stuscore" property="stuscore"/>
+            </collection>
+        </collection>
+    </resultMap>
+    <select id="listByMpIds" resultMap="subjectScore">
+        select subjectid,mptqid,stuscore from ms_paper_student_question where mpid in
+        <foreach collection="mpids" item="mpid" separator="," open="(" close=")">#{mpid}</foreach>
+    </select>
 </mapper>