完善接口内容

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

@@ -117,5 +117,16 @@ public class EReportStudentController {
         return new ResultVo(0, "获取科目试卷分析成功", map);
     }
 
+    //错题集--科目错题数量
+    @PostMapping("/serrornum")
+    public ResultVo listStudentSubjectErrorQues(@RequestBody ReportParamsVo params) {
+        Integer studentid = params.getStudentid();
+        Integer exmaid = params.getExamid();
+        String subjectid = params.getSubjectid();
+        N_Utils.validation(new Object[]{exmaid,"考试id",1,studentid,"学生id",1});
+        List<Map> map = eReportStudentService.listStudentSubjectErrorQues(exmaid,studentid);
+        return new ResultVo(0, "获取科目错题成功", map);
+    }
+
 
 }

sexam/src/main/java/com/xhkjedu/sexam/mapper/reportstu/ERstudentMapper.java

@@ -31,4 +31,6 @@ public interface ERstudentMapper extends TkMapper<ERstudent> {
     List<Map> listStudentQuestionsTk(@Param("epid")Integer epid,@Param("studentid")Integer studentid);
     //学生报告-试卷分析（附件）
     List<Map> listStudentQuestionsFj(@Param("epid")Integer epid,@Param("studentid")Integer studentid);
+    //学生报告-错题集-科目下错题
+    List<Map> listStudentSubjectErrorQues(@Param("examid")Integer examid,@Param("studentid")Integer studentid);
 }

sexam/src/main/java/com/xhkjedu/sexam/model/paperstudent/EPaperStudentQuestion.java

@@ -20,6 +20,12 @@ public class EPaperStudentQuestion extends BaseBean {
     //学生id
     private Integer studentid;
 
+    //考试id
+    private Integer examid;
+
+    //科目id
+    private String subjectid;
+
     //试卷id
     private Integer epid;
 
@@ -85,12 +91,6 @@ public class EPaperStudentQuestion extends BaseBean {
     @Transient
     private String stuname;//学生姓名
 
-    @Transient
-    private Integer examid;
-
-    @Transient
-    private String subjectid;
-
     @Transient
     private String checkname;//批阅人
 

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

@@ -234,6 +234,8 @@ public class EBaseService {
                         EPaperStudentQuestion epsq = new EPaperStudentQuestion();
                         epsq.setClassid(ps.getClassid());
                         epsq.setStudentid(ps.getStudentid());
+                        epsq.setExamid(ps.getExamid());
+                        epsq.setSubjectid(ps.getSubjectid());
                         epsq.setEpid(epid);
                         epsq.setEpsid(ps.getId());
                         epsq.setEptqid(q.getEptqid());
@@ -292,10 +294,10 @@ public class EBaseService {
     @Transactional(rollbackFor = Exception.class)
     public ResultVo delStu(Integer ecsid) {
         EClassStudent student = eClassStudentMapper.selectByPrimaryKey(ecsid);
-        eClassStudentMapper.deleteByPrimaryKey(ecsid);
         EBaseVo exam = eBaseMapper.getExamStateById(student.getExamid());
         int timestamp = N_Utils.getSecondTimestamp() + 30 * 60;
         if (exam.getBegintime().compareTo(timestamp) != 1) return new ResultVo(1, "开考前30分钟禁止移除学生");
+        eClassStudentMapper.deleteByPrimaryKey(ecsid);
         eClassMapper.updateClassNumByCsId(student.getExamid(), student.getClassid());
         return new ResultVo(0, "移除考试学生成功");
     }

sexam/src/main/java/com/xhkjedu/sexam/service/paperstudent/EPaperStudentService.java

@@ -145,6 +145,8 @@ public class EPaperStudentService {
             EPaperStudentQuestion sq = new EPaperStudentQuestion();
             sq.setClassid(psvo.getClassid());
             sq.setStudentid(psvo.getStudentid());
+            sq.setExamid(psvo.getExamid());
+            sq.setSubjectid(psvo.getSubjectid());
             sq.setEpid(psvo.getEpid());
             sq.setEpsid(psvo.getEpsid());
             sq.setEptqid(q.getEptqid());

sexam/src/main/java/com/xhkjedu/sexam/service/paperstudent/EScanbatchService.java

@@ -199,6 +199,7 @@ public class EScanbatchService {
         Map map = new HashMap();
         map.put("dcllist", dcllist);
         map.put("ycllist", ycllist);
+        map.put("errortype",errortype);
         return map;
     }
 

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

@@ -182,66 +182,100 @@ public class EReportStudentService {
     }
 
     //处理母子题
-    private List<Map> setPaperQuestionForTK(List<Map> list){
+    private List<Map> setPaperQuestionForTK(List<Map> list) {
         List<Map> rtnlist = new ArrayList<>();
         List<String> questiopids = new ArrayList<>();
-        for(Map q : list){
+        for (Map q : list) {
             Integer qlevel = Integer.parseInt(q.get("qlevel").toString());
-            if(qlevel == 1){
+            if (qlevel == 1) {
                 //代表单题
                 Map map = new HashMap();
-                map.put("epsqid",Integer.parseInt(q.get("epsqid").toString()));
-                map.put("eptqid",Integer.parseInt(q.get("eptqid").toString()));
-                map.put("ctype",Integer.parseInt(q.get("ctype").toString()));
-                map.put("qn",q.get("qn").toString());
-                map.put("qorder",Integer.parseInt(q.get("qorder").toString()));
-                map.put("qscore",Double.parseDouble(q.get("qscore").toString()));
-                map.put("stuscore",Double.parseDouble(q.get("stuscore").toString()));
-                map.put("answered",Integer.parseInt(q.get("answered").toString()));
-                map.put("answertype",Integer.parseInt(q.get("answertype").toString()));
-                map.put("stuanswer",q.get("stuanswer").toString());
-                map.put("stuanswertxt",q.get("stuanswertxt").toString());
-                map.put("qstem",q.get("qstem").toString());
-                map.put("qoption",q.get("qoption").toString());
-                map.put("qanswer",q.get("qanswer").toString());
-                map.put("qanalyze",q.get("qanalyze").toString());
-                map.put("hashear",Integer.parseInt(q.get("hashear").toString()));
-                map.put("hearfile",q.get("hearfile").toString());
-                map.put("qlevel",qlevel);
-                map.put("classavgscore",Integer.parseInt(q.get("classavgscore").toString()));
-                map.put("gradeavgscore",Integer.parseInt(q.get("gradeavgscore").toString()));
-                if(q.get("points")!=null){
+                map.put("epsqid", Integer.parseInt(q.get("epsqid").toString()));
+                map.put("eptqid", Integer.parseInt(q.get("eptqid").toString()));
+                map.put("ctype", Integer.parseInt(q.get("ctype").toString()));
+                map.put("qn", q.get("qn").toString());
+                map.put("qorder", Integer.parseInt(q.get("qorder").toString()));
+                map.put("qscore", Double.parseDouble(q.get("qscore").toString()));
+                map.put("stuscore", Double.parseDouble(q.get("stuscore").toString()));
+                map.put("answered", Integer.parseInt(q.get("answered").toString()));
+                map.put("answertype", Integer.parseInt(q.get("answertype").toString()));
+                map.put("stuanswer", q.get("stuanswer").toString());
+                map.put("stuanswertxt", q.get("stuanswertxt").toString());
+                map.put("qstem", q.get("qstem").toString());
+                map.put("qoption", q.get("qoption").toString());
+                map.put("qanswer", q.get("qanswer").toString());
+                map.put("qanalyze", q.get("qanalyze").toString());
+                map.put("hashear", Integer.parseInt(q.get("hashear").toString()));
+                map.put("hearfile", q.get("hearfile").toString());
+                map.put("qlevel", qlevel);
+                map.put("classavgscore", Integer.parseInt(q.get("classavgscore").toString()));
+                map.put("gradeavgscore", Integer.parseInt(q.get("gradeavgscore").toString()));
+                if (q.get("points") != null) {
                     List<Map> points = (List<Map>) q.get("points");
-                    map.put("points",points);
+                    map.put("points", points);
                 }
                 rtnlist.add(map);
-            }else{
+            } else {
                 //母题
                 String questionpid = q.get("questionpid").toString();
-                if(!questiopids.contains(questionpid)){
+                if (!questiopids.contains(questionpid)) {
                     questiopids.add(questionpid);
                     //获取所有试题
                     List<Map> sonqueslist = list.stream().filter(s -> s.get("questionpid").toString().equals(questionpid)).collect(Collectors.toList());
                     Map mq = new HashMap();
-                    mq.put("questionid",questionpid);
-                    mq.put("qlevel",2);
-                    mq.put("qorder",Integer.parseInt(q.get("qorder").toString()));
-                    mq.put("ctype",Integer.parseInt(q.get("mctype").toString()));
-                    mq.put("qstem",q.get("mqstem").toString());
-                    mq.put("qoption",q.get("mqoption").toString());
-                    mq.put("qanswer",q.get("mqanswer").toString());
-                    mq.put("qanalyze",q.get("mqanalyze").toString());
-                    mq.put("hashear",Integer.parseInt(q.get("mhashear").toString()));
-                    mq.put("hearfile",q.get("mhearfile").toString());
-                    if(q.get("points")!=null){
+                    mq.put("questionid", questionpid);
+                    mq.put("qlevel", 2);
+                    mq.put("qorder", Integer.parseInt(q.get("qorder").toString()));
+                    mq.put("ctype", Integer.parseInt(q.get("mctype").toString()));
+                    mq.put("qstem", q.get("mqstem").toString());
+                    mq.put("qoption", q.get("mqoption").toString());
+                    mq.put("qanswer", q.get("mqanswer").toString());
+                    mq.put("qanalyze", q.get("mqanalyze").toString());
+                    mq.put("hashear", Integer.parseInt(q.get("mhashear").toString()));
+                    mq.put("hearfile", q.get("mhearfile").toString());
+                    if (q.get("points") != null) {
                         List<Map> points = (List<Map>) q.get("points");
-                        mq.put("points",points);
+                        mq.put("points", points);
                     }
-                    mq.put("sonques",sonqueslist);
+                    mq.put("sonques", sonqueslist);
                     rtnlist.add(mq);
                 }
             }
         }
         return rtnlist;
     }
+
+    /**
+     * @Description 学生报告--错题集
+     * @Param [examid, studentid]
+     * @Return java.util.List<java.util.Map>
+     * @Author wn
+     * @Date 2022/8/29 11:39
+     **/
+    public List<Map> listStudentSubjectErrorQues(Integer examid, Integer studentid) {
+        List<Map> list = eRstudentMapper.listStudentSubjectErrorQues(examid, studentid);
+        for (Map map : list) {
+            List<Map> queslist = (List<Map>) map.get("questions");
+            //单题的数量
+            List<Map> dtlist = queslist.stream().filter(s -> Integer.parseInt(s.get("qlevel").toString()) == 1).collect(Collectors.toList());
+            //子题
+            List<Map> sonlist = queslist.stream().filter(s -> Integer.parseInt(s.get("qlevel").toString()) == 3).collect(Collectors.toList());
+            Map<String,List<Map>> mtmap = sonlist.stream().collect(Collectors.groupingBy(s -> s.get("questionpid").toString()));
+            int num = 0;
+            if(N_Utils.isListNotEmpty(dtlist)){
+                num = dtlist.size();
+            }
+            if(mtmap!=null && mtmap.size()>0){
+                num = num + mtmap.size();
+            }
+            map.put("num",num);
+            map.remove("questions");
+            return list;
+        }
+        return list;
+    }
+
+    public void listStudentErrorQuestions(Integer examid, Integer studentid,String subjectid){
+        
+    }
 }

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

@@ -154,4 +154,23 @@
         where sq.epid=#{epid} and sq.studentid=#{studentid} group by sq.epsqid order by sq.qorder
     </select>
 
+    <!--学生报告-错题集-科目下错题-->
+    <resultMap id="listStudentSubjectErrorQues" type="java.util.Map">
+        <result property="subjectid" column="subjectid" />
+        <result property="subjectname" column="subjectname" />
+        <collection property="questions" ofType="java.util.Map" javaType="java.util.List">
+            <result property="questionid" column="questionid" />
+            <result property="qlevel" column="qlevel" />
+            <result property="questionpid" column="questionpid" />
+        </collection>
+    </resultMap>
+    <select id="listStudentSubjectErrorQues" resultMap="listStudentSubjectErrorQues">
+        select sq.subjectid,s.subjectname,q.questionid,q.qlevel,q.questionpid
+        from e_paper_student_question sq
+                 left join t_question q on q.questionid=sq.questionid
+                 left join t_subject s on sq.subjectid=s.subjectid
+                 left join t_question mq on q.questionpid=mq.questionid
+        where sq.examid=#{examid} and sq.studentid=#{studentid} and sq.stuscore &lt; sq.qscore group by s.subjectid order by s.subjectorder
+    </select>
+
 </mapper>