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

# Conflicts:
#	sexam/src/main/java/com/xhkjedu/sexam/service/report/EReportGenerateService.java

sexam/src/main/java/com/xhkjedu/sexam/controller/paper/EPaperCorrectTeacherController.java

@@ -81,10 +81,10 @@ public class EPaperCorrectTeacherController {
     @PostMapping("/get_cq")
     public ResultVo getCorrectQuestion(@RequestBody EPTeacherVo vo) {
         Integer teacherid = vo.getTeacherid();
-        String eptqids = vo.getEptqids();
+        Integer eptqid = vo.getEptqid();
         Integer esid = vo.getEsid();
-        N_Utils.validation(new Object[]{teacherid, "教师id", 1, eptqids, "试卷试题ids", 2, esid, "考试科目id", 1});
-        return correctTeacherService.getCorrectQuestion(teacherid, eptqids, vo.getClassids(), esid);
+        N_Utils.validation(new Object[]{teacherid, "教师id", 1, eptqid, "试卷试题id", 1, esid, "考试科目id", 1});
+        return correctTeacherService.getCorrectQuestion(teacherid, eptqid, vo.getClassids(), esid);
     }
 
     /**
@@ -97,10 +97,10 @@ public class EPaperCorrectTeacherController {
      **/
     @PostMapping("/get_pre")
     public ResultVo getPreQuestion(@RequestBody EPTeacherVo vo) {
-        Integer epid = vo.getEpid();
+        Integer eptqid = vo.getEptqid();
         Integer teacherid = vo.getTeacherid();
-        N_Utils.validation(new Object[]{epid, "试卷id", 1, teacherid, "教师id", 1});
-        return correctTeacherService.getPreQuestion(epid, teacherid);
+        N_Utils.validation(new Object[]{eptqid, "试卷试题id", 1, teacherid, "教师id", 1});
+        return correctTeacherService.getPreQuestion(eptqid, teacherid);
     }
 
     /**

sexam/src/main/java/com/xhkjedu/sexam/mapper/paper/EPaperCorrectTeacherMapper.java

@@ -16,7 +16,7 @@ public interface EPaperCorrectTeacherMapper {
 
     //随机获取一条待批阅试题
     EPaperSQuestionVo getCorrectQuestion(@Param("teacherid") Integer teacherid,
-                                         @Param("eptqids") String eptqids, @Param("classids") String classids);
+                                         @Param("eptqid") Integer eptqid, @Param("classids") String classids);
 
     //试题批阅情况
     EPaperSQuestionVo getCheckQuestion(@Param("eptqid") Integer eptqid, @Param("teacherid") Integer teacherid);
@@ -25,7 +25,7 @@ public interface EPaperCorrectTeacherMapper {
     void updateCheckQuestionById(@Param("epsqid") Integer epsqid, @Param("teacherid") Integer teacherid);
 
     //获取上一份批阅试题
-    Map getPreQuestion(@Param("epid") Integer epid, @Param("teacherid") Integer teacherid);
+    Map getPreQuestion(@Param("eptqid") Integer eptqid, @Param("teacherid") Integer teacherid);
 
     //阅卷记录
     List<Map> listRecord(@Param("eptqid") Integer eptqid, @Param("teacherid") Integer teacherid);

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/service/paper/EPaperCorrectTeacherService.java

@@ -37,12 +37,12 @@ public class EPaperCorrectTeacherService {
     }
 
     //随机获取待批试题
-    public ResultVo getCorrectQuestion(Integer teacherid, String eptqids, String classids, Integer esid) {
+    public ResultVo getCorrectQuestion(Integer teacherid, Integer eptqid, String classids, Integer esid) {
         lock.lock();
         Map map = correctTeacherMapper.getExamNameByEsId(esid);//根据考试科目id获取考试名称
         try {
             //随机获取一条待批阅试题
-            EPaperSQuestionVo sq = correctTeacherMapper.getCorrectQuestion(teacherid, eptqids, classids);
+            EPaperSQuestionVo sq = correctTeacherMapper.getCorrectQuestion(teacherid, eptqid, classids);
             if (sq == null) return new ResultVo(0, "已批阅完成");
             //修改试卷学生试题为批阅中
             correctTeacherMapper.updateCheckQuestionById(sq.getEpsqid(), teacherid);

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

@@ -2,7 +2,6 @@ package com.xhkjedu.sexam.service.report;
 
 import com.alibaba.fastjson.JSON;
 import com.xhkjedu.sexam.mapper.exam.EClassMapper;
-import com.xhkjedu.sexam.mapper.paper.EPaperAnalyzeMapper;
 import com.xhkjedu.sexam.mapper.paper.EPaperQtypeMapper;
 import com.xhkjedu.sexam.mapper.paperstudent.EPaperStudentMapper;
 import com.xhkjedu.sexam.mapper.paperstudent.EPaperStudentQuestionMapper;
@@ -14,28 +13,31 @@ import com.xhkjedu.sexam.mapper.reportclass.ERclassQtypeMapper;
 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.paper.EPaperAnalyze;
 import com.xhkjedu.sexam.model.paperstudent.EPaperStudentQuestion;
 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.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;
 
 /**
@@ -56,8 +58,7 @@ public class EReportGenerateService {
     private EPaperQtypeMapper ePaperQtypeMapper;
     @Resource
     private EPaperStudentQuestionMapper ePaperStudentQuestionMapper;
-    @Resource
-    private EPaperAnalyzeMapper ePaperAnalyzeMapper;
+
 
     @Resource
     private ERbaseMapper eRbaseMapper;
@@ -76,7 +77,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);
@@ -158,9 +165,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<ERclassQuestionPoint> pointList = new ArrayList<>();//考试报告班级试题知识点情况
         for (Map.Entry<String, List<ERstudent>> ssEntry : subCollect.entrySet()) {
             subjectid = ssEntry.getKey();
             subjectname = subjectMap.get(subjectid);
@@ -244,30 +248,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);
-                }
             }
         }
 
@@ -284,9 +264,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);
 
@@ -298,11 +280,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);
     }
 
     //分数排名
@@ -334,7 +335,7 @@ public class EReportGenerateService {
         }
     }
 
-    //试卷题型、试题、知识点
+    //题型试题
     private void setClassQuestion(Integer examid,List<Map> subjects,List<Map> classes){
         //考试所有学生提交试卷情况
         List<EPaperStudentQuestion> stulist = ePaperStudentQuestionMapper.listExamStudentsAnswer(examid);
@@ -460,26 +461,6 @@ public class EReportGenerateService {
                     rtypelist.add(eRclassQtype);
                 }
             }
-
-            if(ptype == 1){
-                //获取试卷只是分析
-                Map epa = ePaperAnalyzeMapper.getPaperAnalzyeByEpid(epid);
-                String pointjson = epa.get("pointjson").toString();
-                List<Map> pointlist = JSON.parseArray(pointjson,Map.class);
-                //遍历知识点处理年级班级知识点情况
-                for(int j=0;j<pointlist.size();j++){
-                    Map pointmap = pointlist.get(j);
-                    String pointname = pointmap.get("pointname").toString();
-                    Double score = Double.parseDouble(pointmap.get("score").toString());
-                    Double scorerate = Double.parseDouble(pointmap.get("scorerate").toString());
-                    String order = pointmap.get("order").toString();
-
-                
-                }
-
-            }
-
-
         }
         eRclassQtypeMapper.insertList(rtypelist);
         eRclassQuestionMapper.insertList(rqlist);

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/java/com/xhkjedu/sexam/vo/paper/EPTeacherVo.java

@@ -20,7 +20,7 @@ public class EPTeacherVo {
     private Integer teacherid;
 
     //试卷试题ids
-    private String eptqids;
+    private Integer eptqid;
 
     //班级ids
     private String classids;

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

@@ -50,7 +50,7 @@
     <!--随机获取一条待批阅试题-->
     <select id="getCorrectQuestion" resultType="com.xhkjedu.sexam.vo.paper.EPaperSQuestionVo">
         select psq.epsqid,psq.stuanswer,psq.qn,psq.eptqid,psq.qscore,psq.epsid
-        from e_paper_student_question psq where psq.eptqid in(${eptqids})
+        from e_paper_student_question psq where psq.eptqid=#{eptqid}
         and psq.answered=1 and (psq.checked=0 or (psq.checked=1 and psq.checkid=#{teacherid}))
         <if test="classids!=null and classids!=''">
             and psq.classid in(${classids})
@@ -70,7 +70,7 @@
     <!--获取上一份批阅试题-->
     <select id="getPreQuestion" resultType="java.util.Map">
         select psq.epsqid,psq.stuanswer,psq.qn,psq.qorder,psq.qscore,psq.stuscore,psq.good,psq.bad,psq.epsid
-        from e_paper_student_question psq where psq.epid=#{epid} and psq.checked=2 and psq.checkid=#{teacherid}
+        from e_paper_student_question psq where psq.eptqid=#{eptqid} and psq.checked=2 and psq.checkid=#{teacherid}
         order by psq.checktime desc limit 1
     </select>
     <!--阅卷记录-->

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

@@ -8,8 +8,26 @@
     </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>
+    <!--删除考试报告-->
+    <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>
 </mapper>