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

sexam/src/main/java/com/xhkjedu/sexam/mapper/report/EReportGenerateMapper.java

@@ -0,0 +1,21 @@
+package com.xhkjedu.sexam.mapper.report;
+
+import com.xhkjedu.sexam.vo.report.ERPaperVo;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author ywx
+ * @className EReportGenerateMapper
+ * @description 考试报告生成
+ * @date 2022/8/9 10:00
+ **/
+public interface EReportGenerateMapper {
+    //考试科目
+    List<Map> listSubject(@Param("examid") Integer examid);
+
+    //考试试卷
+    public List<ERPaperVo> listPaper(@Param("examid") Integer examid);
+}

sexam/src/main/java/com/xhkjedu/sexam/service/report/EReportGenerateService.java

@@ -1,12 +1,27 @@
 package com.xhkjedu.sexam.service.report;
 
-import com.xhkjedu.sexam.mapper.exam.EBaseMapper;
+import com.alibaba.fastjson.JSON;
 import com.xhkjedu.sexam.mapper.exam.EClassMapper;
-import com.xhkjedu.sexam.mapper.exam.ESubjectMapper;
 import com.xhkjedu.sexam.mapper.paperstudent.EPaperStudentMapper;
 import com.xhkjedu.sexam.mapper.report.ERbaseMapper;
+import com.xhkjedu.sexam.mapper.report.EReportGenerateMapper;
+import com.xhkjedu.sexam.mapper.report.ERsubjectMapper;
+import com.xhkjedu.sexam.mapper.reportclass.ERclassMapper;
+import com.xhkjedu.sexam.mapper.reportclass.ERclassQtypeMapper;
+import com.xhkjedu.sexam.mapper.reportclass.ERclassQuestionErrorMapper;
+import com.xhkjedu.sexam.mapper.reportclass.ERclassQuestionMapper;
+import com.xhkjedu.sexam.mapper.reportclass.ERclassQuestionPointMapper;
 import com.xhkjedu.sexam.mapper.reportstu.ERstudentMapper;
+import com.xhkjedu.sexam.model.report.ERbase;
+import com.xhkjedu.sexam.model.report.ERsubject;
+import com.xhkjedu.sexam.model.reportclass.ERclass;
+import com.xhkjedu.sexam.model.reportclass.ERclassQtype;
+import com.xhkjedu.sexam.model.reportclass.ERclassQuestion;
+import com.xhkjedu.sexam.model.reportclass.ERclassQuestionError;
+import com.xhkjedu.sexam.model.reportclass.ERclassQuestionPoint;
 import com.xhkjedu.sexam.model.reportstu.ERstudent;
+import com.xhkjedu.sexam.vo.paper.EPaperQsVo;
+import com.xhkjedu.sexam.vo.report.ERPaperVo;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -26,45 +41,52 @@ import java.util.stream.Collectors;
 @Service
 public class EReportGenerateService {
     @Resource
-    private EBaseMapper eBaseMapper;
+    private EReportGenerateMapper eReportGenerateMapper;
     @Resource
     private EClassMapper eClassMapper;
     @Resource
-    private ESubjectMapper eSubjectMapper;
-    @Resource
     private EPaperStudentMapper ePaperStudentMapper;
 
     @Resource
     private ERbaseMapper eRbaseMapper;
     @Resource
     private ERstudentMapper eRstudentMapper;
+    @Resource
+    private ERsubjectMapper eRsubjectMapper;
+    @Resource
+    private ERclassMapper eRclassMapper;
+    @Resource
+    private ERclassQtypeMapper eRclassQtypeMapper;
+    @Resource
+    private ERclassQuestionMapper eRclassQuestionMapper;
+    @Resource
+    private ERclassQuestionPointMapper eRclassQuestionPointMapper;
+    @Resource
+    private ERclassQuestionErrorMapper eRclassQuestionErrorMapper;
 
     //生成考试报告
     public void generateExamReport(Integer examid) {
         List<Map> classes = eClassMapper.listByExamId(examid);
-        List<Map> subjects = eSubjectMapper.listSubject(examid);
+        List<Map> subjects = eReportGenerateMapper.listSubject(examid);
+        List<ERPaperVo> papers = eReportGenerateMapper.listPaper(examid);
         int classnum = classes.size();
         int stunum = classes.stream().mapToInt(m -> (int) m.get("classnum")).sum();
         int subjectnum = subjects.size();
-        /*ERbase rbase = new ERbase();
-        rbase.setExamid(examid);
-        rbase.setClassnum(classnum);
-        rbase.setStunum(stunum);
-        rbase.setSubjectnum(subjectnum);
-        eRbaseMapper.insertSelective(rbase);*/
 
         String subjectid = "zf";
         String subjectname = "总分";
         Map<String, String> subjectMap = subjects.stream().collect(Collectors.toMap(m -> m.get("subjectid").toString(),
                 m -> m.get("subjectname").toString()));
+        Map<String, ERPaperVo> paperMap = papers.stream().collect(Collectors.toMap(m -> m.getSubjectid(), m -> m));
 
         List<ERstudent> schoolStudents = new ArrayList<>();//学校学生成绩
+        List<ERstudent> schoolSubjectStudents = new ArrayList<>();//学校科目学生成绩
         List<ERstudent> classStudents = new ArrayList<>();//班级学生成绩
-        List<ERstudent> subjectStudents = new ArrayList<>();//科目学生成绩、
+        List<ERstudent> classSubjectStudents = new ArrayList<>();//班级科目学生成绩
         Map<String, Integer> schoolRank = new HashMap<>();//学校分数排名
+        Map<String, Integer> schoolSubjectRank = new HashMap<>();//学校科目分数排名
         Map<String, Integer> classRank = new HashMap<>();//班级分数排名
-        Map<String, Integer> ssubjectRank = new HashMap<>();//学校科目分数排名
-        Map<String, Integer> csubjectRank = new HashMap<>();//班级科目分数排名
+        Map<String, Integer> classSubjectRank = new HashMap<>();//班级科目分数排名
 
         List<ERstudent> students = ePaperStudentMapper.listByExamId(examid);
         Map<Integer, List<ERstudent>> schoolCollect = students.stream().collect(Collectors.groupingBy(s -> s.getStudentid()));
@@ -75,8 +97,6 @@ public class EReportGenerateService {
             cs.setScore(entry.getValue().stream().mapToDouble(s -> s.getScore()).sum());
             schoolStudents.add(cs);
         }
-        setRank(schoolStudents, schoolRank, 1);//学校分数排名
-
         Map<Integer, List<ERstudent>> cCollect = students.stream().collect(Collectors.groupingBy(s -> s.getClassid()));
         for (Map.Entry<Integer, List<ERstudent>> entry : cCollect.entrySet()) {
             Integer classid = entry.getKey();
@@ -91,8 +111,6 @@ public class EReportGenerateService {
                 cs.setScore(csEntry.getValue().stream().mapToDouble(s -> s.getScore()).sum());
                 classStudents.add(cs);
             }
-            setRank(classStudents, classRank, 2);//班级分数排名
-
             Map<String, List<ERstudent>> subCollect = studentList.stream().collect(Collectors.groupingBy(s -> s.getSubjectid()));
             for (Map.Entry<String, List<ERstudent>> ssEntry : subCollect.entrySet()) {
                 subjectid = ssEntry.getKey();
@@ -100,35 +118,146 @@ public class EReportGenerateService {
                 studentList = ssEntry.getValue();
                 for (ERstudent cs : studentList) {
                     cs.setSubjectname(subjectname);
-                    subjectStudents.add(cs);
+                    classSubjectStudents.add(cs);
                 }
             }
-            setRank(subjectStudents, ssubjectRank, 3);//科目分数排名
         }
 
         DoubleSummaryStatistics schoolStatistics = schoolStudents.stream().mapToDouble(s -> s.getScore()).summaryStatistics();
+        DoubleSummaryStatistics sSStatistics = schoolSubjectStudents.stream().mapToDouble(s -> s.getScore()).summaryStatistics();
         DoubleSummaryStatistics classStatistics = classStudents.stream().mapToDouble(s -> s.getScore()).summaryStatistics();
+        DoubleSummaryStatistics cSStatistics = classSubjectStudents.stream().mapToDouble(s -> s.getScore()).summaryStatistics();
+        double schoolStatisticsMax = schoolStatistics.getMax();
+        double schoolStatisticsAverage = schoolStatistics.getAverage();
+        double schoolStatisticsMin = schoolStatistics.getMin();
+
+        ERbase rbase = new ERbase();
+        rbase.setExamid(examid);
+        rbase.setClassnum(classnum);
+        rbase.setStunum(stunum);
+        rbase.setMissnum(students.stream().filter(l -> l.getSstate() == 3)
+                .map(l -> l.getStudentid()).distinct().collect(Collectors.toList()).size());
+        rbase.setSubjectnum(subjectnum);
+        rbase.setMaxscore(schoolStatisticsMax);
+        rbase.setAvgscore(schoolStatisticsAverage);
+        rbase.setMixscore(schoolStatisticsMin);
+        eRbaseMapper.insertSelective(rbase);
+
+        Map<String, List<ERstudent>> subCollect = students.stream().collect(Collectors.groupingBy(s -> s.getSubjectid()));
+        List<ERsubject> subjectList = new ArrayList<>();//考试报告科目情况
+        List<ERclass> classList = new ArrayList<>();//考试报告班级情况
+        List<ERclassQtype> qtypeList = new ArrayList<>();//考试报告班级题型情况
+        List<ERclassQuestion> questionList = new ArrayList<>();//考试报告班级试题情况
+        List<ERclassQuestionError> errorList = new ArrayList<>();//考试报告班级高频错题情况
+        List<ERclassQuestionPoint> pointList = new ArrayList<>();//考试报告班级试题知识点情况
+        for (Map.Entry<String, List<ERstudent>> ssEntry : subCollect.entrySet()) {
+            subjectid = ssEntry.getKey();
+            subjectname = subjectMap.get(subjectid);
+            List<ERstudent> list = ssEntry.getValue();
+            Map<Integer, List<ERstudent>> sCollect = list.stream().collect(Collectors.groupingBy(s -> s.getStudentid()));
+            for (Map.Entry<Integer, List<ERstudent>> csEntry : sCollect.entrySet()) {
+                ERstudent cs = new ERstudent();
+                cs.setClassid(0);
+                cs.setStudentid(csEntry.getKey());
+                cs.setSubjectid(subjectid);
+                cs.setSubjectname(subjectname);
+                cs.setScore(csEntry.getValue().stream().mapToDouble(s -> s.getScore()).sum());
+                schoolSubjectStudents.add(cs);
+            }
+            ERPaperVo rp = paperMap.get(subjectid);
+            Double allscore = rp.getPscore();//满分
+            double yxscore = allscore * 0.85;//优秀分
+            double lhscore = allscore * 0.7;//良好分
+            double jgscore = allscore * 0.6;//及格分
+            double dfscore = allscore * 0.4;//低分
+
+            DoubleSummaryStatistics statistics = list.stream().mapToDouble(s -> s.getScore()).summaryStatistics();
+            ERsubject rs = new ERsubject();
+            rs.setExamid(examid);
+            rs.setSubjectid(subjectid);
+            rs.setSubjectname(subjectname);
+            rs.setScore(allscore);
+            rs.setMaxscore(statistics.getMax());
+            rs.setMinscore(statistics.getMin());
+            rs.setAvgscore(statistics.getAverage());
+            rs.setStunum(list.stream().filter(l -> l.getSstate() == 2).collect(Collectors.toList()).size());
+            rs.setMissnum(list.stream().filter(l -> l.getSstate() == 3).collect(Collectors.toList()).size());
+            subjectList.add(rs);
+
+            Map<Integer, List<ERstudent>> claCollect = list.stream().collect(Collectors.groupingBy(s -> s.getClassid()));
+            for (Map.Entry<Integer, List<ERstudent>> entry : claCollect.entrySet()) {
+                Integer classid = entry.getKey();
+                List<ERstudent> rstudentList = entry.getValue();
+                statistics = rstudentList.stream().mapToDouble(s -> s.getScore()).summaryStatistics();
+                ERclass rc = new ERclass();
+                rc.setExamid(examid);
+                rc.setClassid(classid);
+                rc.setSubjectid(subjectid);
+                rc.setSubjectname(subjectname);
+                rc.setAllscore(allscore);
+                rc.setClassmaxscore(statistics.getMax());
+                rc.setClassminscore(statistics.getMin());
+                rc.setClassavgscore(statistics.getAverage());
+                rc.setStunum(rstudentList.stream().filter(l -> l.getSstate() == 2).collect(Collectors.toList()).size());
+                rc.setMissnum(rstudentList.stream().filter(l -> l.getSstate() == 3).collect(Collectors.toList()).size());
+                classList.add(rc);
+                List<EPaperQsVo> typelist = JSON.parseArray(rp.getQnumjson(), EPaperQsVo.class);
+                for (EPaperQsVo t : typelist) {
+                    ERclassQtype rt = new ERclassQtype();
+                    rt.setExamid(examid);
+                    rt.setClassid(classid);
+                    rt.setSubjectid(subjectid);
+                    rt.setQtypename(t.getQtname());
+                    rt.setScore(t.getScore());
+                    rt.setNum(t.getNum());
+                    rt.setSrate(t.getSrate());
+                    qtypeList.add(rt);
+                }
+
+                List<Map> points = JSON.parseArray(rp.getQnumjson(), Map.class);
+                for (Map p : points) {
+                    ERclassQuestionPoint rqp = new ERclassQuestionPoint();
+                    rqp.setExamid(examid);
+                    rqp.setClassid(classid);
+                    rqp.setSubjectid(subjectid);
+                    rqp.setPointname(p.get("pointname").toString());
+                    rqp.setScore((Double) p.get("score"));
+                    rqp.setSrate((Double) p.get("srate"));
+                    pointList.add(rqp);
+                }
+            }
+        }
+
+        eRclassMapper.insertList(classList);
+        eRsubjectMapper.insertList(subjectList);
+
+        setRank(schoolStudents, schoolRank, 1);//学校分数排名
+        setRank(schoolSubjectStudents, schoolSubjectRank, 2);//学校科目分数排名
+        setRank(classStudents, classRank, 3);//班级分数排名
+        setRank(classSubjectStudents, classSubjectRank, 4);//班级科目分数排名
+
         for (ERstudent cs : classStudents) {
             Integer studentid = cs.getStudentid();
-            cs.setClassrank(classRank.get(cs.getClassid()+"_"+ studentid));
+            cs.setClassrank(classRank.get(cs.getClassid() + "_" + studentid));
             cs.setClassmaxscore(classStatistics.getMax());
             cs.setClassavgscore(classStatistics.getAverage());
             cs.setSchoolrank(schoolRank.get(studentid));
-            cs.setSchoolmaxscore(schoolStatistics.getMax());
-            cs.setSchoolavgscore(schoolStatistics.getAverage());
+            cs.setSchoolmaxscore(schoolStatisticsMax);
+            cs.setSchoolavgscore(schoolStatisticsAverage);
         }
         eRstudentMapper.insertList(classStudents);
 
-        for (ERstudent cs : subjectStudents) {
+        for (ERstudent cs : classSubjectStudents) {
             Integer studentid = cs.getStudentid();
-            cs.setClassrank(classRank.get(cs.getClassid()+"_"+ studentid));
+            Integer classid = cs.getClassid();
+            cs.setClassrank(classRank.get(classid + "_" + studentid));
             cs.setClassmaxscore(classStatistics.getMax());
             cs.setClassavgscore(classStatistics.getAverage());
-            cs.setSchoolrank(schoolRank.get(studentid));
-            cs.setSchoolmaxscore(schoolStatistics.getMax());
-            cs.setSchoolavgscore(schoolStatistics.getAverage());
+            cs.setSchoolrank(schoolSubjectRank.get(classid + "_" + cs.getSubjectid() + "_" + studentid));
+            cs.setSchoolmaxscore(sSStatistics.getMax());
+            cs.setSchoolavgscore(sSStatistics.getAverage());
         }
-        eRstudentMapper.insertList(subjectStudents);
+        eRstudentMapper.insertList(classSubjectStudents);
     }
 
     //分数排名
@@ -147,10 +276,12 @@ public class EReportGenerateService {
                 String subjectid = cgs.getSubjectid();
                 if (code == 1) {//学校
                     key = studentid.toString();
-                } else if (code == 2) {//班级
-                    key = classid + "_" + studentid;
-                } else {//科目
+                } else if (code == 2) {//学校科目
                     key = subjectid + "_" + studentid;
+                } else if (code == 3) {//班级
+                    key = classid + "_" + studentid;
+                } else {//班级科目
+                    key = classid + "_" + subjectid + "_" + studentid;
                 }
                 rank.put(key, index);
             }

sexam/src/main/java/com/xhkjedu/sexam/vo/report/ERPaperVo.java

@@ -0,0 +1,27 @@
+package com.xhkjedu.sexam.vo.report;
+
+import lombok.Data;
+
+/**
+ * @author ywx
+ * @classname ERPaperVo
+ * @description 
+ * @date 2022/8/9 11:27
+ **/
+@Data
+public class ERPaperVo {
+    //科目id
+    private String subjectid;
+
+    //试卷总分
+    private Double pscore;
+
+    //试题量分布分析
+    private String qnumjson;
+
+    //难易度
+    private String complexityjson;
+
+    //知识点分析
+    private String pointjson;
+}

sexam/src/main/resources/mapper/paper/EPaperCorrectTeacherMapper.xml

@@ -5,8 +5,8 @@
     <select id="listPending" resultType="java.util.Map">
         select a.*,eb.examname,eb.gradeid,eb.examtype,es.sdate,es.begintime,es.endtime,es.subjectname
         ,truncate(a.pynum*100/a.tjnum,2)pgrate
-        from(select p.esid,p.epid,group_concat(distinct pq.qn order by pq.eptqid)qns
-        ,group_concat(distinct pq.eptqid order by pq.eptqid)eptqids,group_concat(distinct pc.classid)classids
+        from(select p.esid,p.epid,group_concat(distinct concat(pq.qn,'_',pq.eptqid) order by pq.eptqid)qns
+        ,group_concat(distinct pc.classid)classids
         ,count(case when psq.answered=1 then psq.epsqid else null end)tjnum
         ,count(case when psq.answered=1 and psq.checked=2 then psq.epsqid else null end)pynum
         from e_paper p left join e_paper_qtype_question pq on p.epid = pq.epid
@@ -14,8 +14,8 @@
         left join e_paper_student_question psq on psq.epid = pc.epid and psq.classid=pc.classid and psq.qorder=pq.qorder
         where pc.teacherid=#{teacherid} and pq.ctype in(3,14,15) group by p.epid
         union
-        select p.esid,p.epid,group_concat(distinct pq.qn order by pq.eptqid)qns
-        ,group_concat(distinct pq.eptqid order by pq.eptqid)eptqids,0 classids
+        select p.esid,p.epid,group_concat(distinct concat(pq.qn,'_',pq.eptqid) order by pq.eptqid)qns
+        ,0 classids
         ,count(case when psq.answered=1 then psq.epsqid else null end)tjnum
         ,count(case when psq.answered=1 and psq.checked=2 then psq.epsqid else null end)pynum
         from e_paper p left join e_paper_correctquestion pq on p.epid = pq.epid
@@ -28,8 +28,8 @@
     <select id="listMarked" resultType="java.util.Map">
         select a.*,eb.examname,eb.gradeid,eb.examtype,es.sdate,es.begintime,es.endtime,es.subjectname
         ,100 pgrate
-        from(select p.esid,p.epid,group_concat(distinct pq.qn order by pq.eptqid)qns
-        ,group_concat(distinct pq.eptqid order by pq.eptqid)eptqids,group_concat(distinct pc.classid)classids
+        from(select p.esid,p.epid,group_concat(distinct concat(pq.qn,'_',pq.eptqid) order by pq.eptqid)qns
+        ,group_concat(distinct pc.classid)classids
         ,count(case when psq.answered=1 then psq.epsqid else null end)tjnum
         ,count(case when psq.answered=1 and psq.checked=2 then psq.epsqid else null end)pynum
         from e_paper p left join e_paper_qtype_question pq on p.epid = pq.epid
@@ -37,8 +37,8 @@
         left join e_paper_student_question psq on psq.epid = pc.epid and psq.classid=pc.classid and psq.qorder=pq.qorder
         where pc.teacherid=#{teacherid} and pq.ctype in(3,14,15) group by p.epid
         union
-        select p.esid,p.epid,group_concat(distinct pq.qn order by pq.eptqid)qns
-        ,group_concat(distinct pq.eptqid order by pq.eptqid)eptqids,0 classids
+        select p.esid,p.epid,group_concat(distinct concat(pq.qn,'_',pq.eptqid) order by pq.eptqid)qns
+        ,0 classids
         ,count(case when psq.answered=1 then psq.epsqid else null end)tjnum
         ,count(case when psq.answered=1 and psq.checked=2 then psq.epsqid else null end)pynum
         from e_paper p left join e_paper_correctquestion pq on p.epid = pq.epid

sexam/src/main/resources/mapper/report/EReportGenerateMapper.xml

@@ -0,0 +1,14 @@
+<?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.sexam.mapper.report.EReportGenerateMapper">
+    <!--考试科目-->
+    <select id="listSubject" resultType="java.util.Map">
+        select subjectid,subjectname from e_subject where examid=#{examid}
+    </select>
+    <!--考试试卷-->
+    <select id="listPaper" resultType="com.xhkjedu.sexam.vo.report.ERPaperVo">
+        select ep.subjectid,ep.pscore,epa.qnumjson,epa.complexityjson,epa.pointjson
+        from e_paper ep left join e_paper_analyze epa on ep.epid = epa.epid
+        where ep.examid=#{examid}
+    </select>
+</mapper>