学生报告，批量改分

sexam/src/main/java/com/xhkjedu/sexam/controller/paperstudent/EPaperStudentQuestionHistoryController.java

@@ -4,6 +4,8 @@ import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.xhkjedu.sexam.model.paperstudent.EPaperStudentQuestionHistory;
 import com.xhkjedu.sexam.service.paperstudent.EPaperStudentQuestionHistoryService;
+import com.xhkjedu.sexam.vo.paperstudent.PaperStudentParamsVo;
+import com.xhkjedu.sexam.vo.paperstudent.QuestionScoreVo;
 import com.xhkjedu.utils.N_Utils;
 import com.xhkjedu.utils.PageUtil;
 import com.xhkjedu.vo.PageResult;
@@ -27,9 +29,13 @@ public class EPaperStudentQuestionHistoryController {
 
     //更改学生试题得分
     @PostMapping("/upstus")
-    public ResultVo updateQuestionStuscore(@RequestBody EPaperStudentQuestionHistory psh) {
+    public ResultVo updateQuestionStuscore(@RequestBody PaperStudentParamsVo psh) {
         try {
-            N_Utils.validation(new Object[]{psh.getEpsqid(), "试题id", 1, psh.getTeacherid(),"教师id",1});
+            List<QuestionScoreVo> queslist = psh.getQuestions();
+            N_Utils.validation(new Object[]{psh.getTeacherid(),"教师id",1});
+            if(N_Utils.isListEmpty(queslist)){
+                return new ResultVo(1,"试题不能为空");
+            }
             ePaperStudentQuestionHistoryService.updateQuestionStuscore(psh);
             return new ResultVo(0, "成功保存学生试题得分");
         } catch (Exception e) {

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

@@ -122,9 +122,30 @@ public class EReportStudentController {
     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);
+    }
+
+    //学生报告-错题集-学生科目下错题（附件）
+    @PostMapping("/serrorfj")
+    public ResultVo listStudentErrorQuesForFj(@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,subjectid,"科目id",3});
+        List<Map> map = eReportStudentService.listStudentErrorQuestionsFj(exmaid,studentid,subjectid);
+        return new ResultVo(0, "获取科目错题成功", map);
+    }
+
+    //学生报告-错题集-学生科目下错题（题库）
+    @PostMapping("/serrorq")
+    public ResultVo listStudentErrorQuesForTK(@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,subjectid,"科目id",3});
+        Map map = eReportStudentService.listStudentErrorQuestionsTk(exmaid,studentid,subjectid);
         return new ResultVo(0, "获取科目错题成功", map);
     }
 

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

@@ -18,4 +18,7 @@ public interface EPaperAnalyzeMapper extends TkMapper<EPaperAnalyze> {
 
     //获取试卷分析
     Map getPaperAnalzyeByEpid(@Param("epid")Integer epid);
+
+    //根据考试id和科目获取试卷你分析
+    Map getPaperAnalzyeBySubjectid(@Param("examid")Integer examid,@Param("subjectid")String subjectid);
 }

sexam/src/main/java/com/xhkjedu/sexam/mapper/paperstudent/EPaperStudentQuestionMapper.java

@@ -52,16 +52,13 @@ public interface EPaperStudentQuestionMapper extends TkMapper<EPaperStudentQuest
     //报告生成-学生试卷
     List<EPaperStudentQuestion> listExamStudentsAnswer(@Param("examid")Integer examid);
 
-    //修改学生得分
-    void updateStuScoreByepsqid(@Param("stuscore")Double stuscore,@Param("epsqid")Integer epsqid);
-
-    //根据试题id获取考试信息
-    EPaperStudentQuestion getExamPaperStudntQuestionbyEpsqid(@Param("epsqid")Integer epsqid);
-
     //学生作答得分试卷-题库
     List<Map> listQStuQuestionScore(@Param("epsid")Integer epsid);
 
     //学生作答得分试卷-附件
     List<Map> listFjStuQuestionScore(@Param("epsid")Integer epsid);
 
+    //根据学生试卷id获取学生作答内容
+    List<EPaperStudentQuestion> listStuQuestionsByEpsid(@Param("epsid")Integer epsid);
+
 }

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

@@ -31,6 +31,10 @@ 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);
+    //学生报告-错题集-学生科目下错题
+    List<Map> listStudentErrorQuestionsForTk(@Param("examid")Integer examid,@Param("studentid")Integer studentid,@Param("subjectid")String subjectid);
+    //学生报告-错题集-学生科目下错题（附件）
+    List<Map> listStudentErrorQuestionsForFj(@Param("examid")Integer examid,@Param("studentid")Integer studentid,@Param("subjectid")String subjectid);
 }

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

@@ -5,11 +5,14 @@ import com.xhkjedu.sexam.mapper.paperstudent.EPaperStudentQuestionHistoryMapper;
 import com.xhkjedu.sexam.mapper.paperstudent.EPaperStudentQuestionMapper;
 import com.xhkjedu.sexam.model.paperstudent.EPaperStudentQuestion;
 import com.xhkjedu.sexam.model.paperstudent.EPaperStudentQuestionHistory;
+import com.xhkjedu.sexam.vo.paperstudent.PaperStudentParamsVo;
+import com.xhkjedu.sexam.vo.paperstudent.QuestionScoreVo;
 import com.xhkjedu.utils.N_Utils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
@@ -32,24 +35,41 @@ public class EPaperStudentQuestionHistoryService {
      * @Date 2022/8/10 16:17
      **/
     @Transactional(rollbackFor = Exception.class)
-    public void updateQuestionStuscore(EPaperStudentQuestionHistory sqh){
-        //学生试题详情
-        EPaperStudentQuestion q = ePaperStudentQuestionMapper.getExamPaperStudntQuestionbyEpsqid(sqh.getEpsqid());
-        sqh.setExamid(q.getExamid());
-        sqh.setSubjectid(q.getSubjectid());
-        sqh.setEpid(q.getEpid());
-        sqh.setClassid(q.getClassid());
-        sqh.setStudentid(q.getStudentid());
-        sqh.setCreatetime(N_Utils.getSecondTimestamp());
-        sqh.setStuscore(q.getStuscore());
-        sqh.setQn(q.getQn());
+    public void updateQuestionStuscore(PaperStudentParamsVo psparams){
+        //获取学生试卷作答情况
+        List<EPaperStudentQuestion> stuques = ePaperStudentQuestionMapper.listStuQuestionsByEpsid(psparams.getEpsid());
+        List<QuestionScoreVo> queslist = psparams.getQuestions();
+        List<EPaperStudentQuestion> upqueslist = new ArrayList<>();//修改的试题分值
+        List<EPaperStudentQuestionHistory> sqhlist = new ArrayList<>();//修改历史记录
+        for(QuestionScoreVo q : queslist){
+            EPaperStudentQuestion sq = new EPaperStudentQuestion();
+            sq.setEpsqid(q.getEpsqid());
+            sq.setStuscore(q.getStuscore());
+            upqueslist.add(sq);
+
+            //获取该试题
+            EPaperStudentQuestion psques = stuques.stream().filter(s-> s.getEpsqid().equals(q.getEpsqid())).findFirst().orElse(null);
+            if(psques !=null){
+                EPaperStudentQuestionHistory sqh = new EPaperStudentQuestionHistory();
+                sqh.setExamid(psques.getExamid());
+                sqh.setSubjectid(psques.getSubjectid());
+                sqh.setEpid(psques.getEpid());
+                sqh.setClassid(psques.getClassid());
+                sqh.setStudentid(psques.getStudentid());
+                sqh.setCreatetime(N_Utils.getSecondTimestamp());
+                sqh.setStuscore(psques.getStuscore());
+                sqh.setUpscore(q.getStuscore());
+                sqh.setQn(psques.getQn());
+                sqhlist.add(sqh);
+            }
+        }
 
         //修改学生单个试题得分
-        ePaperStudentQuestionMapper.updateStuScoreByepsqid(sqh.getUpscore(),sqh.getEpsqid());
+        ePaperStudentQuestionMapper.updateBatchStuQuestionScore(upqueslist);
         //修改学生试卷分值
-        ePaperStudentMapper.updateStuPaperscoreEpsid(q.getEpsid());
+        ePaperStudentMapper.updateStuPaperscoreEpsid(psparams.getEpsid());
         //保存更改学生分值记录
-        ePaperStudentQuestionHistoryMapper.insertSelective(sqh);
+        ePaperStudentQuestionHistoryMapper.insertList(sqhlist);
     }
 
     /**

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

@@ -1,19 +1,21 @@
 package com.xhkjedu.sexam.service.report;
 
+import com.alibaba.fastjson.JSON;
 import com.xhkjedu.sexam.mapper.exam.EBaseMapper;
 import com.xhkjedu.sexam.mapper.exam.EClassMapper;
 import com.xhkjedu.sexam.mapper.exam.ESubjectMapper;
+import com.xhkjedu.sexam.mapper.paper.EPaperAnalyzeMapper;
 import com.xhkjedu.sexam.mapper.paper.EPaperFileMapper;
 import com.xhkjedu.sexam.mapper.paper.EPaperMapper;
 import com.xhkjedu.sexam.mapper.reportstu.ERstudentMapper;
+import com.xhkjedu.sexam.vo.paper.QuestionOrderVo;
+import com.xhkjedu.sexam.vo.paper.QuestionPointVo;
 import com.xhkjedu.utils.N_Utils;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.lang.reflect.Array;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**
@@ -36,6 +38,8 @@ public class EReportStudentService {
     private EPaperMapper ePaperMapper;
     @Resource
     private EPaperFileMapper ePaperFileMapper;
+    @Resource
+    private EPaperAnalyzeMapper ePaperAnalyzeMapper;
 
     /**
      * @Description 获取考试基本信息（科目、班级、班级下学生）
@@ -201,9 +205,9 @@ public class EReportStudentService {
                 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("answer", q.get("answer").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());
@@ -246,7 +250,7 @@ public class EReportStudentService {
     }
 
     /**
-     * @Description 学生报告--错题集
+     * @Description 学生报告--错题集--科目错题数量
      * @Param [examid, studentid]
      * @Return java.util.List<java.util.Map>
      * @Author wn
@@ -256,26 +260,76 @@ public class EReportStudentService {
         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();
+            Integer ptype = Integer.parseInt(map.get("ptype").toString());
+            if(ptype==1){
+                //单题的数量
+                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);
+            }else{
+                map.put("num",queslist.size());
             }
-            map.put("num",num);
             map.remove("questions");
             return list;
         }
         return list;
     }
 
-    public void listStudentErrorQuestions(Integer examid, Integer studentid,String subjectid){
-        
+    /**
+     * @Description 学生报告--错题集--题库
+     * @Param [examid, studentid, subjectid]
+     * @Return java.util.Map
+     * @Author wn
+     * @Date 2022/8/29 16:15
+     **/
+    public Map listStudentErrorQuestionsTk(Integer examid, Integer studentid,String subjectid){
+        List<Map> list = eRstudentMapper.listStudentErrorQuestionsForTk(examid,studentid,subjectid);
+        Map panalyze = ePaperAnalyzeMapper.getPaperAnalzyeBySubjectid(examid,subjectid);
+        String pointjson = panalyze.get("pointjson").toString();
+        List<Map> pointlist = JSON.parseArray(pointjson, Map.class);
+        List<Map> pointqueslist = new ArrayList<>();
+        for(Map pointmap : pointlist){
+            //知识点包含的试题
+            List<QuestionOrderVo> ques = (List<QuestionOrderVo>) pointmap.get("ques");
+            List<Integer> eptqidlist = new ArrayList<>();//知识点关联的所有试题
+            for(QuestionOrderVo qovo : ques){
+                Integer[] eptqids = qovo.getEptqids();
+                eptqidlist.addAll(Arrays.asList(eptqids));
+            }
+            //获取知识点下试题
+            List<Map> poinques = list.stream().filter(s -> eptqidlist.contains(Integer.parseInt(s.get("eptqid").toString()))).collect(Collectors.toList());
+            if(N_Utils.isListNotEmpty(poinques)){
+                Map pmap = new HashMap();
+                pmap.put("pointid",pointmap.get("pointid").toString());
+                pmap.put("pointname",pointmap.get("pointname").toString());
+                pmap.put("questions",setPaperQuestionForTK(poinques));
+                pointqueslist.add(pmap);
+            }
+        }
+        Map map = new HashMap();
+        map.put("questions",setPaperQuestionForTK(list));
+        map.put("points",pointqueslist);
+        return map;
+    }
+
+    /**
+     * @Description 学生报告-错题集-学生科目下错题（附件）
+     * @Param [examid, studentid, subjectid]
+     * @Return java.util.Map
+     * @Author wn
+     * @Date 2022/8/29 16:15
+     **/
+    public List<Map> listStudentErrorQuestionsFj(Integer examid, Integer studentid,String subjectid){
+        return eRstudentMapper.listStudentErrorQuestionsForFj(examid,studentid,subjectid);
     }
+
 }

sexam/src/main/java/com/xhkjedu/sexam/vo/paperstudent/PaperStudentParamsVo.java

@@ -0,0 +1,20 @@
+package com.xhkjedu.sexam.vo.paperstudent;
+
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @Description
+ * @Author WN
+ * Date 2022/8/29 14:53
+ **/
+@Data
+public class PaperStudentParamsVo {
+    private Integer teacherid;
+
+    private Integer epsid;//学生试卷id
+
+    private List<QuestionScoreVo> questions = new ArrayList<>();
+}

sexam/src/main/java/com/xhkjedu/sexam/vo/paperstudent/QuestionScoreVo.java

@@ -0,0 +1,15 @@
+package com.xhkjedu.sexam.vo.paperstudent;
+
+import lombok.Data;
+
+/**
+ * @Description
+ * @Author WN
+ * Date 2022/8/29 14:54
+ **/
+@Data
+public class QuestionScoreVo {
+    private Integer epsqid;//学生试题id
+
+    private Double stuscore;//学生试题得分
+}

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

@@ -10,5 +10,12 @@
     <select id="getPaperAnalzyeByEpid" resultType="java.util.Map">
         select * from e_paper_analyze where epid=#{epid}
     </select>
+    
+    <!--根据考试id和科目获取试卷你分析-->
+    <select id="getPaperAnalzyeBySubjectid" resultType="java.util.Map">
+        select a.* from e_paper_analyze a left join e_paper p on a.epid= p.epid
+        left join e_subject s on p.esid=s.esid
+        where s.examid=#{examid} and s.subjectid=#{subjectid}
+    </select>
 
 </mapper>

sexam/src/main/resources/mapper/paperstudent/EPaperStudentQuestionMapper.xml

@@ -137,16 +137,6 @@
         left join t_user u on q.studentid=u.userid where s.examid=#{examid} and s.sstate=2 group by q.epsqid
     </select>
 
-    <!--修改学生得分-->
-    <update id="updateStuScoreByepsqid">
-        update e_paper_student_question set stuscore=#{stuscore} where epsqid=#{epsqid}
-    </update>
-    <!---根据试题id获取考试信息-->
-    <select id="getExamPaperStudntQuestionbyEpsqid" resultType="com.xhkjedu.sexam.model.paperstudent.EPaperStudentQuestion">
-        select q.*,s.examid,s.subjectid from e_paper_student_question q left join e_paper_student s on s.epsid=q.epsid
-        where q.epsqid=#{epsqid}
-    </select>
-
     <!--学生作答试卷题库-->
     <resultMap id="qtypesQuestion" type="java.util.Map">
         <result column="ctype" property="ctype"></result>
@@ -231,4 +221,9 @@
         where psq.epsid=#{epsid} order by pt.eptorder, psq.qorder
     </select>
 
+    <!--根据学生试卷id获取学生作答内容-->
+    <select id="listStuQuestionsByEpsid" resultType="com.xhkjedu.sexam.model.paperstudent.EPaperStudentQuestion">
+        select * from e_paper_student_question where epsid=#{epsid} order by epsqid
+    </select>
+
 </mapper>

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

@@ -98,7 +98,7 @@
         <result property="stuanswertxt" column="stuanswertxt" />
         <result property="qstem" column="qstem" />
         <result property="qoption" column="qoption" />
-        <result property="qanswer" column="qanswer" />
+        <result property="answer" column="answer" />
         <result property="qanalyze" column="qanalyze" />
         <result property="hashear" column="hashear" />
         <result property="hearfile" column="hearfile" />
@@ -125,13 +125,14 @@
     </resultMap>
     <select id="listStudentQuestionsTk" resultMap="listStudentQues">
         select sq.epsqid,sq.eptqid,sq.ctype,sq.questionid,sq.qn,sq.qorder,sq.qscore,sq.stuscore,sq.answered,
-        sq.answertype,sq.stuanswer,sq.stuanswertxt,q.qstem,q.qoption,q.qanswer,q.qanalyze,q.hashear,q.hearfile,
+        sq.answertype,sq.stuanswer,sq.stuanswertxt,pq.answer,q.qstem,q.qoption,q.qanalyze,q.hashear,q.hearfile,
         q.qlevel,q.sorder,q.questionpid,mq.questionid mquestionid,mq.qstem mqstem,mq.qoption mqoption,mq.qanswer mqanswer,
         mq.qanalyze mqanalyze,mq.hashear mhashear,mq.hearfile mhearfile,mq.qlevel mqlevel,mq.ctype mctype,mq.snum msnum,
         cq.classavgscore,cq.gradeavgscore
         from e_paper_student_question sq left join t_question q on sq.questionid=q.questionid
         left join t_question mq on q.questionpid=mq.questionid
         left join e_rclass_question cq on sq.eptqid=cq.eptqid
+        left join e_paper_qtype_question pq on sq.eptqid=pq.eptqid
         where sq.epid=#{epid} and sq.studentid=#{studentid} GROUP BY sq.epsqid order by sq.qorder,q.sorder
     </select>
     <select id="listQuesPoints" resultType="java.util.Map">
@@ -154,23 +155,50 @@
         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" />
+        <result property="ptype" column="ptype" />
         <collection property="questions" ofType="java.util.Map" javaType="java.util.List">
+            <result property="eptqid" column="eptqid" />
             <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
+        select sq.subjectid,s.subjectname,sq.eptqid,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
+        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>
+    <!--学生报告-错题集-学生科目下错题（题库）-->
+    <select id="listStudentErrorQuestionsForTk" resultMap="listStudentQues">
+        select sq.epsqid,sq.eptqid,sq.ctype,sq.questionid,sq.qn,sq.qorder,sq.qscore,sq.stuscore,sq.answered,
+               sq.answertype,sq.stuanswer,sq.stuanswertxt,pq.answer,q.qstem,q.qoption,q.qanswer,q.qanalyze,q.hashear,q.hearfile,
+               q.qlevel,q.sorder,q.questionpid,mq.questionid mquestionid,mq.qstem mqstem,mq.qoption mqoption,mq.qanswer mqanswer,
+               mq.qanalyze mqanalyze,mq.hashear mhashear,mq.hearfile mhearfile,mq.qlevel mqlevel,mq.ctype mctype,mq.snum msnum,
+               cq.classavgscore,cq.gradeavgscore
+        from e_paper_student_question sq left join t_question q on sq.questionid=q.questionid
+        left join t_question mq on q.questionpid=mq.questionid
+        left join e_rclass_question cq on sq.eptqid=cq.eptqid
+        left join e_paper_qtype_question pq on sq.eptqid=pq.eptqid
+        where sq.examid=#{examid} and sq.subjectid=#{subjectid} and sq.studentid=#{studentid} and sq.stuscore &lt; sq.qscore
+        GROUP BY sq.epsqid order by sq.qorder,q.sorder
+    </select>
+
+    <!--学生报告-错题集-学生科目下错题（附件）-->
+    <select id="listStudentErrorQuestionsForFj" resultType="java.util.Map">
+        select sq.epsqid,sq.eptqid,sq.ctype,sq.qn,sq.qorder,sq.qscore,sq.stuscore,sq.answered,
+               sq.answertype,sq.stuanswer,sq.stuanswertxt,q.qtypeid,q.qtypename,q.optionnum,q.answer,
+               cq.classavgscore,cq.gradeavgscore
+        from e_paper_student_question sq left join e_rclass_question cq on sq.eptqid=cq.eptqid
+        left join e_paper_qtype_question q on sq.eptqid=q.eptqid
+        where sq.examid=#{examid} and sq.subjectid=#{subjectid} and sq.studentid=#{studentid} group by sq.epsqid order by sq.qorder
+
+    </select>
 
 </mapper>