考试报告

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

@@ -1,5 +1,6 @@
 package com.xhkjedu.sexam.mapper.report;
 
+import com.xhkjedu.sexam.model.reportstu.ERstudent;
 import com.xhkjedu.sexam.vo.report.ERPaperVo;
 import org.apache.ibatis.annotations.Param;
 
@@ -17,5 +18,11 @@ public interface EReportGenerateMapper {
     List<Map> listSubject(@Param("examid") Integer examid);
 
     //考试试卷
-    public List<ERPaperVo> listPaper(@Param("examid") Integer examid);
+    List<ERPaperVo> listPaper(@Param("examid") Integer examid);
+
+    //删除考试报告
+    void deleteExamReport(@Param("examid") Integer examid);
+
+    //学生上次考试排名及目标
+    List<ERstudent> listStuRankAndGoal(@Param("examid") Integer examid);
 }

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

@@ -1,42 +0,0 @@
-package com.xhkjedu.sexam.model.reportclass;
-
-import com.xhkjedu.sexam.model.BaseBean;
-import lombok.Data;
-
-import javax.persistence.Id;
-import javax.persistence.Table;
-
-@Table(name = "e_rclass_question_error")
-@Data
-public class ERclassQuestionError extends BaseBean {
-    @Id
-    //考试报告班级单科高频错题表
-    private Integer rceqid;
-
-    //考试id
-    private Integer examid;
-
-    //班级id
-    private Integer classid;
-
-    //科目id
-    private String subjectid;
-
-    //题号
-    private String qn;
-
-    //题型名称
-    private String qtypename;
-
-    //知识点
-    private String pointname;
-
-    //班级得分率
-    private Double classrate;
-
-    //年级得分率
-    private Double graderate;
-
-    //高频错误项
-    private String errormsg;
-}

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

@@ -20,22 +20,25 @@ 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.utils.ExamUtil;
 import com.xhkjedu.sexam.vo.paper.EPaperQPointVo;
-import com.xhkjedu.sexam.vo.paper.EPaperQsVo;
 import com.xhkjedu.sexam.vo.paper.EPaperQtypeQuestionVo;
 import com.xhkjedu.sexam.vo.paper.EPaperQtypeVo;
 import com.xhkjedu.sexam.vo.report.ERClassScoreVo;
 import com.xhkjedu.sexam.vo.report.ERPaperVo;
 import com.xhkjedu.utils.N_Utils;
-
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
 import javax.annotation.Resource;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Comparator;
+import java.util.DoubleSummaryStatistics;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 import java.util.stream.Collectors;
 
 /**
@@ -77,7 +80,13 @@ public class EReportGenerateService {
 
 
     //生成考试报告
+    @Transactional(rollbackFor = Exception.class)
     public void generateExamReport(Integer examid) {
+        //生成前先删除以前的考试报告
+        eReportGenerateMapper.deleteExamReport(examid);
+        //学生上次考试排名及目标
+        List<ERstudent> stuRankGoals = eReportGenerateMapper.listStuRankAndGoal(examid);
+
         List<Map> classes = eClassMapper.listByExamId(examid);
         List<Map> subjects = eReportGenerateMapper.listSubject(examid);
         List<ERPaperVo> papers = eReportGenerateMapper.listPaper(examid);
@@ -159,10 +168,6 @@ public class EReportGenerateService {
         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);
@@ -246,30 +251,6 @@ public class EReportGenerateService {
                 rc.setDfrate(N_Utils.getIntegerDivideAndMulitiply(dfnum, stunum));
                 rc.setBzc(ExamUtil.standardDiviation(scores));
                 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);
-                }
             }
         }
 
@@ -286,9 +267,11 @@ public class EReportGenerateService {
             cs.setClassrank(classStuRank.get(cs.getClassid() + "_" + studentid));
             cs.setClassmaxscore(classStatistics.getMax());
             cs.setClassavgscore(classStatistics.getAverage());
-            cs.setSchoolrank(schoolStuRank.get(studentid));
+            Integer schoolrank = schoolStuRank.get(studentid);
+            cs.setSchoolrank(schoolrank);
             cs.setSchoolmaxscore(schoolStatisticsMax);
             cs.setSchoolavgscore(schoolStatisticsAverage);
+            setStuGoal(stuRankGoals, cs, schoolrank);//设置学生目标
         }
         eRstudentMapper.insertList(classStudents);
 
@@ -300,11 +283,30 @@ public class EReportGenerateService {
             cs.setClassrank(classSubStuRank.get(classid + "_" + subjectid + "_" + studentid));
             cs.setClassmaxscore(cSStatistics.getMax());
             cs.setClassavgscore(cSStatistics.getAverage());
-            cs.setSchoolrank(schoolSubStuRank.get(subjectid + "_" + studentid));
+            Integer schoolrank = schoolSubStuRank.get(subjectid + "_" + studentid);
+            cs.setSchoolrank(schoolrank);
             cs.setSchoolmaxscore(sSStatistics.getMax());
             cs.setSchoolavgscore(sSStatistics.getAverage());
+            setStuGoal(stuRankGoals, cs, schoolrank);//设置学生目标
         }
         eRstudentMapper.insertList(classSubjectStudents);
+
+        setClassQuestion(examid, subjects, classes);//题型试题
+    }
+
+    //设置学生目标
+    private void setStuGoal(List<ERstudent> stuRankGoals, ERstudent cs, Integer schoolrank) {
+        String goalparam = "0.2";
+        ERstudent rg = stuRankGoals.stream().filter(s -> s.getStudentid().equals(cs.getStudentid())
+                && s.getSubjectid().equals(cs.getSubjectid())).findFirst().orElse(null);
+        Integer goal = 0;
+        Integer nextgoal = 0;
+        if (rg != null) {
+            goal = rg.getNextgoal();
+            nextgoal = ExamUtil.getUserGroupGoalByParam(schoolrank, goalparam);
+        }
+        cs.setGoal(goal);
+        cs.setNextgoal(nextgoal);
     }
 
     //分数排名

sexam/src/main/java/com/xhkjedu/sexam/utils/ExamUtil.java

@@ -1,5 +1,6 @@
 package com.xhkjedu.sexam.utils;
 
+import com.xhkjedu.utils.N_Utils;
 import lombok.extern.slf4j.Slf4j;
 
 import java.math.BigDecimal;
@@ -153,4 +154,23 @@ public class ExamUtil {
     public static double standardDiviation(List<Double> x) {
         return Math.sqrt(variance(x));
     }
+
+    /**
+     * 根据本次排名和参数计算下次的目标
+     *
+     * @param countschool:本次排名
+     * @param goalparam：进步目标参数
+     * @return
+     */
+    public static Integer getUserGroupGoalByParam(Integer countschool, String goalparam) {
+        if (countschool != null && (1 == countschool || 2 == countschool)) {//若本次是第一名或者第二名，则下次目标一定是第一名
+            return 1;
+        } else {
+            BigDecimal count = countschool == null || N_Utils.isEmpty(goalparam) ? new BigDecimal(0) :
+                    new BigDecimal(goalparam).multiply(new BigDecimal(countschool.toString()));//进步的名次
+            Integer thiscount = countschool == null ? 0 : new BigDecimal(countschool.toString()).subtract(count).intValue();
+            //舍弃小数点
+            return thiscount;
+        }
+    }
 }

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

@@ -8,12 +8,25 @@
     </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 ep.subjectid,ep.pscore from e_paper ep where ep.examid=#{examid}
     </select>
-    <select id="listStu" resultType="com.xhkjedu.sexam.model.reportstu.ERstudent">
-        select er.studentid,er.subjectid,er.classrank,er.schoolrank
+    <!--删除考试报告-->
+    <delete id="deleteExamReport">
+        delete from e_rbase where examid=#{examid};
+        delete from e_rclass where examid=#{examid};
+        delete from e_rclass_qtype where examid=#{examid};
+        delete from e_rclass_question where examid=#{examid};
+        delete from e_rclass_question_point where examid=#{examid};
+        delete from e_rclass_rank where examid=#{examid};
+        delete from e_rgrade_rank where examid=#{examid};
+        delete from e_rrank where examid=#{examid};
+        delete from e_rstudent where examid=#{examid};
+        delete from e_rstudent_point where examid=#{examid};
+        delete from e_rsubject where examid=#{examid};
+    </delete>
+    <!--学生上次考试排名及目标-->
+    <select id="listStuRankAndGoal" resultType="com.xhkjedu.sexam.model.reportstu.ERstudent">
+        select er.studentid,er.subjectid,er.schoolrank,er.nextgoal
         from(select max(er.rsid)rsid from e_class_student ecs left join e_rstudent er on ecs.studentid = er.studentid
         where ecs.examid=#{examid} group by er.studentid,er.subjectid)a left join e_rstudent er on a.rsid=er.rsid
     </select>