考试报告

sexam/src/main/java/com/xhkjedu/sexam/controller/exam/EBaseController.java

@@ -11,6 +11,7 @@ import com.xhkjedu.sexam.model.notice.TNoticeClass;
 import com.xhkjedu.sexam.model.notice.TNoticeTeacher;
 import com.xhkjedu.sexam.service.exam.EBaseService;
 import com.xhkjedu.sexam.service.notice.NoticeService;
+import com.xhkjedu.sexam.service.report.EReportGenerateService;
 import com.xhkjedu.sexam.vo.exam.EBaseVo;
 import com.xhkjedu.sexam.vo.exam.ExamVo;
 import com.xhkjedu.sexam.vo.system.UserVo;
@@ -43,6 +44,8 @@ public class EBaseController {
     private EBaseService eBaseService;
     @Resource
     private NoticeService noticeService;
+    @Resource
+    private EReportGenerateService eReportGenerateService;
 
     /**
      * 发起考试
@@ -404,4 +407,38 @@ public class EBaseController {
         String macNumber = eBaseService.getMacNumber(mac);
         return new ResultVo(0, "获取mac编号成功", macNumber);
     }
+
+    /**
+     * 考试科目选择列表
+     *
+     * @return com.xhkjedu.vo.ResultVo
+     * @Param [eBase]
+     * @Author ywx
+     * @Date 2022/9/7 14:23
+     **/
+    @PostMapping("/list_selsub")
+    public ResultVo listSubjectForSel(@RequestBody EBase eBase) {
+        Integer examid = eBase.getExamid();
+        N_Utils.validation(new Object[]{examid, "考试id", 1});
+        List<Map> list = eBaseService.listSubjectForSel(examid);
+        return new ResultVo(0, "获取考试科目列表成功", list);
+    }
+
+    /**
+     * 生成考试报告
+     *
+     * @return com.xhkjedu.vo.ResultVo
+     * @Param [eBase]
+     * @Author ywx
+     * @Date 2022/9/8 9:56
+     **/
+    @PostMapping("/scbg")
+    public ResultVo generateExamReport(@RequestBody EBase eBase) {
+        Integer examid = eBase.getExamid();
+        Integer createid = eBase.getCreateid();
+        N_Utils.validation(new Object[]{examid, "考试id", 1, createid, "操作人", 1});
+        eReportGenerateService.generateExamReport(examid, createid);
+        return new ResultVo(0, "生成成功");
+    }
+
 }

sexam/src/main/java/com/xhkjedu/sexam/controller/report/EReportClassController.java

@@ -110,11 +110,44 @@ public class EReportClassController {
      **/
     @PostMapping("/get_dkgk")
     public ResultVo getDkGk(@RequestBody ERankParamVo rank) {
-        N_Utils.validation(new Object[]{rank.getExamid(), "考试id", 1, rank.getClassid(), "班级id", 1, rank.getSubjectid(), "科目id", 2});
+        N_Utils.validation(new Object[]{rank.getExamid(), "考试id", 1, rank.getClassid(), "班级id", 1
+                , rank.getSubjectid(), "科目id", 2});
         Map map = eReportClassService.getDkGk(rank);
         return new ResultVo(0, "获取成功", map);
     }
 
+    /**
+     * 单科概况-平均分
+     *
+     * @return com.xhkjedu.vo.ResultVo
+     * @Param [rank]
+     * @Author ywx
+     * @Date 2022/9/7 14:41
+     **/
+    @PostMapping("/list_pjf")
+    public ResultVo listPjf(@RequestBody ERankParamVo rank) {
+        N_Utils.validation(new Object[]{rank.getExamid(), "考试id", 1, rank.getClassid(), "班级id", 1
+                , rank.getSubjectid(), "科目id", 2});
+        List<Map> list = eReportClassService.listPjf(rank);
+        return new ResultVo(0, "获取成功", list);
+    }
+
+    /**
+     * 单科概况-高频错题
+     *
+     * @return com.xhkjedu.vo.ResultVo
+     * @Param [rank]
+     * @Author ywx
+     * @Date 2022/9/7 14:41
+     **/
+    @PostMapping("/list_gpct")
+    public ResultVo listGpCt(@RequestBody ERankParamVo rank) {
+        N_Utils.validation(new Object[]{rank.getExamid(), "考试id", 1, rank.getClassid(), "班级id", 1
+                , rank.getSubjectid(), "科目id", 2});
+        List<Map> list = eReportClassService.listGpCt(rank);
+        return new ResultVo(0, "获取成功", list);
+    }
+
     /*
      * 单科概况-需关注学生
      * @Param [rank]
@@ -141,7 +174,7 @@ public class EReportClassController {
     public ResultVo listSjGk(@RequestBody ERankParamVo rank) {
         N_Utils.validation(new Object[]{rank.getExamid(), "考试id", 1, rank.getClassid(), "班级id", 1
                 , rank.getSubjectid(), "科目id", 2});
-        List<Map> list = eReportClassService.listSjGk(rank);
+        Map list = eReportClassService.listSjGk(rank);
         return new ResultVo(0, "获取成功", list);
     }
 

sexam/src/main/java/com/xhkjedu/sexam/mapper/exam/ESubjectMapper.java

@@ -37,4 +37,7 @@ public interface ESubjectMapper extends TkMapper<ESubject> {
 
     //获取考试关联科目及科目下试题数量
     List<Map> listSubjectAndPnum(@Param("examid") Integer examid);
+
+    //考试科目选择列表
+    List<Map> listSubjectForSel(Integer examid);
 }

sexam/src/main/java/com/xhkjedu/sexam/model/reportclass/ERclass.java

@@ -66,4 +66,7 @@ public class ERclass extends BaseBean {
 
     //标准差
     private Double bzc;
+
+    //全科标准差
+    private Double qkbzc;
 }

sexam/src/main/java/com/xhkjedu/sexam/model/reportstu/ERstudent.java

@@ -6,6 +6,8 @@ import lombok.Data;
 import javax.persistence.Id;
 import javax.persistence.Table;
 import javax.persistence.Transient;
+import java.util.ArrayList;
+import java.util.List;
 
 @Table(name = "e_rstudent")
 @Data
@@ -70,4 +72,9 @@ public class ERstudent extends BaseBean {
     @Transient
     //总分校次
     private Integer zfSchoolRank;
+
+    @Transient
+    //班级ids
+    private List<Integer> classids = new ArrayList<>();
+
 }

sexam/src/main/java/com/xhkjedu/sexam/service/exam/EBaseService.java

@@ -1,20 +1,12 @@
 package com.xhkjedu.sexam.service.exam;
 
-import com.xhkjedu.sexam.mapper.exam.EBaseMacMapper;
-import com.xhkjedu.sexam.mapper.exam.EBaseMapper;
-import com.xhkjedu.sexam.mapper.exam.EClassMapper;
-import com.xhkjedu.sexam.mapper.exam.EClassStudentMapper;
-import com.xhkjedu.sexam.mapper.exam.ESubjectMapper;
+import com.xhkjedu.sexam.mapper.exam.*;
 import com.xhkjedu.sexam.mapper.paper.EPaperMapper;
 import com.xhkjedu.sexam.mapper.paper.EPaperQtypeQuestionMapper;
 import com.xhkjedu.sexam.mapper.paperstudent.EPaperStudentMapper;
 import com.xhkjedu.sexam.mapper.paperstudent.EPaperStudentQuestionMapper;
 import com.xhkjedu.sexam.mapper.system.UserMapper;
-import com.xhkjedu.sexam.model.exam.EBase;
-import com.xhkjedu.sexam.model.exam.EBaseMac;
-import com.xhkjedu.sexam.model.exam.EClass;
-import com.xhkjedu.sexam.model.exam.EClassStudent;
-import com.xhkjedu.sexam.model.exam.ESubject;
+import com.xhkjedu.sexam.model.exam.*;
 import com.xhkjedu.sexam.model.paper.EPaper;
 import com.xhkjedu.sexam.model.paper.EPaperQtypeQuestion;
 import com.xhkjedu.sexam.model.paperstudent.EPaperStudent;
@@ -364,4 +356,9 @@ public class EBaseService {
         }
         return macCode + ebmid;
     }
+
+    //考试科目选择列表
+    public List<Map> listSubjectForSel(Integer examid) {
+        return eSubjectMapper.listSubjectForSel(examid);
+    }
 }

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

@@ -75,14 +75,17 @@ public class EReportClassService {
     //单科概况
     public Map getDkGk(ERankParamVo rank) {
         Map map = eRclassMapper.findById(rank);//班级概况
-        List<Map> pjfList = eRclassMapper.listPjf(rank);//平均分
-        map.put("pjfList", pjfList);
-        List<Map> cjdjList = eRclassMapper.listCjDj(rank);//成绩等级分布
-        map.put("cjdjList", cjdjList);
-        rank.setRanktype(1);//大幅进步
-        List<Map> gzxsList = eRclassMapper.listGzXs(rank);//需关注学生
-        map.put("gzxsList", gzxsList);
-        List<Map> gpctList = eRclassMapper.listGpCt(rank);//高频错题
+        return map;
+    }
+
+    //单科概况-平均分
+    public List<Map> listPjf(ERankParamVo rank) {
+        return eRclassMapper.listPjf(rank);
+    }
+
+    //单科概况-高频错题
+    public List<Map> listGpCt(ERankParamVo rank) {
+        List<Map> gpctList = eRclassMapper.listGpCt(rank);
         for (Map ct : gpctList) {
             //知识点
             setQuestionPoint(ct);
@@ -92,8 +95,7 @@ public class EReportClassService {
             ct.remove("answer");
             ct.remove("pointjson");
         }
-        map.put("gpctList", gpctList);
-        return map;
+        return gpctList;
     }
 
     //试题知识点
@@ -135,11 +137,12 @@ public class EReportClassService {
     }
 
     //试卷概况
-    public List<Map> listSjGk(ERankParamVo rank) {
+    public Map listSjGk(ERankParamVo rank) {
         Map paper = eReportClassMapper.getPaperByExamSubjectId(rank);
         Integer ptype = (Integer) paper.get("ptype");
+        List<Map> list;
         if (ptype == 1) {
-            List<Map> list = eReportClassMapper.listTkSjGk(rank);
+            list = eReportClassMapper.listTkSjGk(rank);
             List<Map> questions = eReportClassMapper.listTkQuestion((Integer) paper.get("epid"));
             Object pointjson = paper.get("pointjson");
             for (Map q : list) {
@@ -184,15 +187,17 @@ public class EReportClassService {
                     q.put("qorder", qmap.get("qorder"));
                 }
             }
-            return list;
         } else {
             String examname = paper.get("examname").toString();
-            List<Map> list = eReportClassMapper.listFjSjGk(rank);
+            list = eReportClassMapper.listFjSjGk(rank);
             for (Map q : list) {
                 q.put("qstem", examname + "-第" + q.get("qorder") + "题");
             }
-            return list;
         }
+        paper.remove("examname");
+        paper.remove("pointjson");
+        paper.put("questions", list);
+        return paper;
     }
 
     //试卷分析

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

@@ -136,6 +136,7 @@ public class EReportGenerateService {
             List<ERstudent> studentList = entry.getValue();
 
             Map<Integer, List<ERstudent>> sCollect = studentList.stream().collect(Collectors.groupingBy(s -> s.getStudentid()));
+            List<ERstudent> rstudents = new ArrayList<>();
             for (Map.Entry<Integer, List<ERstudent>> csEntry : sCollect.entrySet()) {
                 ERstudent cs = new ERstudent();
                 cs.setExamid(examid);
@@ -144,17 +145,22 @@ public class EReportGenerateService {
                 cs.setSubjectid(subjectid);
                 cs.setSubjectname(subjectname);
                 cs.setScore(csEntry.getValue().stream().mapToDouble(s -> s.getScore()).sum());
-                classStudents.add(cs);
+                rstudents.add(cs);
             }
+            setRank(rstudents, classStuRank, 3);//班级学生分数排名
+            classStudents.addAll(rstudents);
             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();
                 subjectname = subjectMap.get(subjectid);
                 studentList = ssEntry.getValue();
+                rstudents = new ArrayList<>();
                 for (ERstudent cs : studentList) {
                     cs.setSubjectname(subjectname);
-                    classSubjectStudents.add(cs);
+                    rstudents.add(cs);
                 }
+                setRank(rstudents, classSubStuRank, 4);//班级科目学生分数排名
+                classSubjectStudents.addAll(rstudents);
             }
         }
 
@@ -187,6 +193,7 @@ public class EReportGenerateService {
             subjectname = subjectMap.get(subjectid);
             List<ERstudent> list = ssEntry.getValue();
             Map<Integer, List<ERstudent>> sCollect = list.stream().collect(Collectors.groupingBy(s -> s.getStudentid()));
+            List<ERstudent> rstudents = new ArrayList<>();
             for (Map.Entry<Integer, List<ERstudent>> csEntry : sCollect.entrySet()) {
                 ERstudent cs = new ERstudent();
                 cs.setClassid(0);
@@ -194,8 +201,10 @@ public class EReportGenerateService {
                 cs.setSubjectid(subjectid);
                 cs.setSubjectname(subjectname);
                 cs.setScore(csEntry.getValue().stream().mapToDouble(s -> s.getScore()).sum());
-                schoolSubjectStudents.add(cs);
+                rstudents.add(cs);
             }
+            setRank(rstudents, schoolSubStuRank, 2);//学校科目学生分数排名
+            schoolSubjectStudents.addAll(rstudents);
             ERPaperVo rp = paperMap.get(subjectid);
             Double allscore = rp.getPscore();//满分
             setSubject(examid, stunum, subjectid, subjectname, subjectList, classList, list, allscore);
@@ -206,9 +215,6 @@ public class EReportGenerateService {
         eRsubjectMapper.insertList(subjectList);
 
         setRank(schoolStudents, schoolStuRank, 1);//学校学生分数排名
-        setRank(schoolSubjectStudents, schoolSubStuRank, 2);//学校科目学生分数排名
-        setRank(classStudents, classStuRank, 3);//班级学生分数排名
-        setRank(classSubjectStudents, classSubStuRank, 4);//班级科目学生分数排名
 
         for (ERstudent cs : classStudents) {
             Integer studentid = cs.getStudentid();
@@ -240,7 +246,7 @@ public class EReportGenerateService {
         }
         eRstudentMapper.insertList(classSubjectStudents);
 
-//        setClassQuestion(examid, subjects, classes);//题型试题
+        setClassQuestion(examid, subjects, classes);//题型试题
         List<Integer> userids = students.stream().map(ERstudent::getStudentid).distinct().collect(Collectors.toList());
         List<UserVo> users = userMapper.listNameByUserIds(userids);
         Map<Integer, String> userMap = users.stream().collect(Collectors.toMap(UserVo::getUserid, UserVo::getUsername));
@@ -278,7 +284,8 @@ public class EReportGenerateService {
         rs.setLhrate(N_Utils.getIntegerDivideAndMulitiply(lhnum, stunum));
         rs.setJgrate(N_Utils.getIntegerDivideAndMulitiply(jgnum, stunum));
         rs.setDfrate(N_Utils.getIntegerDivideAndMulitiply(dfnum, stunum));
-        rs.setBzc(ExamUtil.standardDiviation(scores));
+        double qkbzc = ExamUtil.standardDiviation(scores);
+        rs.setBzc(qkbzc);
         int sknum = list.size();
         rs.setStunum(sknum);//实考人数
         rs.setMissnum(stunum - sknum);//缺考人数=计划人数-实考人数
@@ -290,6 +297,7 @@ public class EReportGenerateService {
             List<ERstudent> rstudentList = entry.getValue();
             DoubleSummaryStatistics claStatistics = rstudentList.stream().mapToDouble(s -> s.getScore()).summaryStatistics();
             ERclass rc = new ERclass();
+            rc.setQkbzc(qkbzc);
             rc.setExamid(examid);
             rc.setClassid(classid);
             rc.setSubjectid(subjectid);
@@ -908,6 +916,17 @@ public class EReportGenerateService {
         Map<String, List<ERstudent>> sscollect = students.stream().collect(
                 Collectors.groupingBy(s -> s.getSubjectid() + "_" + s.getStudentid()));
         setStuScore(sscollect, sstudents);
+
+        //排名
+        Map<String, Integer> schoolStuRank = new HashMap<>();//学校学生分数排名
+        setRank(cstudents, schoolStuRank, 1);//学校学生分数排名
+        for (ERstudent cs : students) {
+            Integer studentid = cs.getStudentid();
+            Integer classid = cs.getClassid();
+            Integer schoolrank = schoolStuRank.get(studentid.toString());
+            cs.setSchoolrank(schoolrank);
+        }
+
         //全部班级统计
         Map<String, List<ERstudent>> qbbjcollect = sstudents.stream().collect(
                 Collectors.groupingBy(s -> s.getSubjectid()));

sexam/src/main/resources/mapper/exam/ESubjectMapper.xml

@@ -69,4 +69,8 @@
         from e_subject es left join e_paper p on es.esid=p.esid
         where es.examid=#{examid} order by es.esid
     </select>
+    <!--考试科目选择列表-->
+    <select id="listSubjectForSel" resultType="java.util.Map">
+        select es.subjectid,es.subjectname from e_subject es where es.examid=#{examid}
+    </select>
 </mapper>

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

@@ -4,7 +4,7 @@
     <!--校级报告-成绩分析-->
     <select id="listByExamId" resultType="java.util.Map">
         select er.allscore,er.classmaxscore,er.classminscore,er.classavgscore,er.schoolmaxscore,er.schoolavgscore
-        ,er.stunum,er.missnum,er.yxrate,er.lhrate,er.jgrate,er.dfrate,er.bzc
+        ,er.stunum,er.missnum,er.yxrate,er.lhrate,er.jgrate,er.dfrate,er.bzc,er.qkbzc
         ,er.classid,(case when er.classid=0 then '全部班级' else ec.classname end)classname
         from e_rclass er left join e_class ec on er.examid = ec.examid and er.classid = ec.classid
         where er.examid=#{rank.examid} and er.subjectid=#{rank.subjectid}
@@ -15,7 +15,7 @@
     <!--班级报告-学科成绩-->
     <select id="listByExamAndClassId" resultType="java.util.Map">
         select er.allscore,er.classmaxscore,er.classminscore,er.classavgscore,er.schoolmaxscore,er.schoolavgscore
-        ,er.stunum,er.missnum,er.yxrate,er.lhrate,er.jgrate,er.dfrate,er.bzc
+        ,er.stunum,er.missnum,er.yxrate,er.lhrate,er.jgrate,er.dfrate,er.bzc,er.qkbzc
         ,er.classid,(case when er.classid=0 then '全部班级' else ec.classname end)classname
         ,(case when er.subjectid='zf' then '总分' else (select s.subjectname from t_subject s where
                 er.subjectid=s.subjectid) end)subjectname
@@ -32,9 +32,9 @@
     </select>
     <!--班级报告-单科概况-平均分-->
     <select id="listPjf" resultType="java.util.Map">
-        select er.classavgscore,ec.classname
+        select er.classavgscore,ec.classname,er.classid
         from e_rclass er left join e_class ec on er.examid = ec.examid and er.classid = ec.classid
-        where er.examid=#{rank.examid} and er.classid=#{rank.classid} and er.subjectid=#{rank.subjectid}
+        where er.examid=#{rank.examid} and er.subjectid=#{rank.subjectid}
     </select>
     <!--班级报告-单科概况-成绩等级分布-->
     <select id="listCjDj" resultType="java.util.Map">
@@ -46,6 +46,7 @@
     <!--班级报告-单科概况-需关注学生-->
     <select id="listGzXs" resultType="java.util.Map">
         select u.username,er.score,er.classrank,er.classrankpre,er.goal
+        <if test="rank.ranktype==3">,es.score*0.6 hgscore</if>
         from e_rstudent er left join t_user u on er.studentid=u.userid
         <if test="rank.ranktype==3">
             left join e_rsubject es on er.examid = es.examid and es.subjectid=er.subjectid
@@ -58,7 +59,7 @@
             and er.classrankpre&lt;=5
         </if>
         <if test="rank.ranktype==3">
-            and es.score*0.6-er.score &lt;5
+            and abs(es.score*0.6-er.score) between 0.01 and 5
         </if>
         <if test="rank.ranktype==4">
             and abs(er.classrankpre)>=10

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

@@ -25,5 +25,8 @@
         <if test="rank.ranktype!=null and rank.ranktype!=0">
             and err.ranktype=#{rank.ranktype}
         </if>
+        <if test="rank.subjectid!=null and rank.subjectid!=''">
+            and err.subjectid=#{rank.subjectid}
+        </if>
     </select>
 </mapper>

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

@@ -21,6 +21,9 @@
         from e_class_student s left join t_user u on s.studentid=u.userid
         left join e_class c on s.classid=c.classid
         where s.examid=#{stu.examid}
+        <foreach collection="stu.classids" item="classid" open="and s.classid in(" separator="," close=")">
+            ${classid}
+        </foreach>
         <if test="stu.classid!=null and stu.classid!=0">
             and s.classid=#{stu.classid}
         </if>