考试报告试题想过

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

@@ -48,5 +48,7 @@ public interface EPaperStudentQuestionMapper extends TkMapper<EPaperStudentQuest
     //修改缺考学生试卷试题批阅状态
     void updateStuQuestionChecked(@Param("epsid")Integer epsid,@Param("studentid")Integer studentid);
 
+    //报告生成-学生试卷
+    List<EPaperStudentQuestion> listExamStudentsAnswer(@Param("examid")Integer examid);
 
 }

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

@@ -5,6 +5,7 @@ import lombok.Data;
 
 import javax.persistence.Id;
 import javax.persistence.Table;
+import javax.persistence.Transient;
 
 @Table(name = "e_paper_student_question")
 @Data
@@ -81,4 +82,7 @@ public class EPaperStudentQuestion extends BaseBean {
     //学生答题卡作答图片
     private String stupic;
 
+    @Transient
+    private String stuname;//学生姓名
+
 }

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

@@ -22,6 +22,9 @@ public class ERclassQtype extends BaseBean {
     //科目id
     private String subjectid;
 
+    //试卷id
+    private Integer epid;
+
     //题型名称
     private String qtypename;
 

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

@@ -37,17 +37,14 @@ public class ERclassQuestion extends BaseBean {
     //试题难易度
     private Integer complexity;
 
-    //得分率
-    private Double scorerate;
-
     //班级最高分
     private Double classmaxscore;
 
     //班级平均分
     private Double classavgscore;
 
-    //班级平均分占比
-    private Double classavgrate;
+    //班级得分率
+    private Double classsrate;
 
     //年级最高分
     private Double grademaxscore;
@@ -55,9 +52,15 @@ public class ERclassQuestion extends BaseBean {
     //年级平均分
     private Double gradeavgscore;
 
-    //年级平均分占比
-    private Double gradeavgrate;
+    //年级得分率
+    private Double gradesrate;
+
+    //学生作答情况
+    private String answerjson;
+
+    //优秀学生
+    private String goodstujson;
 
-    //选择题选项占比和学生名单
-    private String optionjson;
+    //违规学生
+    private String badstujson;
 }

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

@@ -2,7 +2,9 @@ package com.xhkjedu.sexam.service.report;
 
 import com.alibaba.fastjson.JSON;
 import com.xhkjedu.sexam.mapper.exam.EClassMapper;
+import com.xhkjedu.sexam.mapper.paper.EPaperQtypeMapper;
 import com.xhkjedu.sexam.mapper.paperstudent.EPaperStudentMapper;
+import com.xhkjedu.sexam.mapper.paperstudent.EPaperStudentQuestionMapper;
 import com.xhkjedu.sexam.mapper.report.ERbaseMapper;
 import com.xhkjedu.sexam.mapper.report.EReportGenerateMapper;
 import com.xhkjedu.sexam.mapper.report.ERsubjectMapper;
@@ -12,6 +14,7 @@ import com.xhkjedu.sexam.mapper.reportclass.ERclassQuestionErrorMapper;
 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.paperstudent.EPaperStudentQuestion;
 import com.xhkjedu.sexam.model.report.ERbase;
 import com.xhkjedu.sexam.model.report.ERsubject;
 import com.xhkjedu.sexam.model.reportclass.ERclass;
@@ -20,16 +23,19 @@ 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 javax.annotation.Resource;
-import java.util.ArrayList;
-import java.util.DoubleSummaryStatistics;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**
@@ -46,6 +52,11 @@ public class EReportGenerateService {
     private EClassMapper eClassMapper;
     @Resource
     private EPaperStudentMapper ePaperStudentMapper;
+    @Resource
+    private EPaperQtypeMapper ePaperQtypeMapper;
+    @Resource
+    private EPaperStudentQuestionMapper ePaperStudentQuestionMapper;
+
 
     @Resource
     private ERbaseMapper eRbaseMapper;
@@ -64,6 +75,7 @@ public class EReportGenerateService {
     @Resource
     private ERclassQuestionErrorMapper eRclassQuestionErrorMapper;
 
+
     //生成考试报告
     public void generateExamReport(Integer examid) {
         List<Map> classes = eClassMapper.listByExamId(examid);
@@ -288,4 +300,275 @@ public class EReportGenerateService {
             index = index + entry.getValue().size();
         }
     }
+
+    //题型试题
+    private void setClassQuestion(Integer examid,List<Map> subjects,List<Map> classes){
+        //考试所有学生提交试卷情况
+        List<EPaperStudentQuestion> stulist = ePaperStudentQuestionMapper.listExamStudentsAnswer(examid);
+
+        List<ERclassQtype> rtypelist = new ArrayList<>();
+        List<ERclassQuestion> rqlist = new ArrayList<>();
+
+        for(Map map : subjects){
+            String subjectid = map.get("subjectid").toString();
+            Integer epid = Integer.parseInt(map.get("epid").toString());//获取试卷id
+            Integer ptype = Integer.parseInt(map.get("ptype").toString());//试卷类型1题库2附件
+            Double pscore = Double.parseDouble(map.get("pscore").toString());
+            List<EPaperQtypeVo> fjtypelist = new ArrayList<>();
+            if(ptype == 1){
+                fjtypelist = ePaperQtypeMapper.listPaperQtypeQuestions(epid);//试卷题型试题信息（题库）
+                setEPaperQtypeForQues(fjtypelist);
+            }else{
+                fjtypelist = ePaperQtypeMapper.listPaperQtypeQuesitonsForFj(epid);//试卷题型试题信息（附件）
+            }
+
+            //遍及试卷处理题型下各班级得分情况
+            for(EPaperQtypeVo t : fjtypelist){
+                Double eptscore = t.getEptscore();
+                Double tgscore = 0.0;//题型下年级得分
+                int stunum = 0;
+                Map<Integer, ERClassScoreVo> tcmap = new HashMap<>();//题型下班级得分
+                String qnstr = "";
+                List<EPaperQtypeQuestionVo> questionVos = t.getQuestions();
+                for(int i=0;i<questionVos.size();i++){
+                    EPaperQtypeQuestionVo q = questionVos.get(i);
+                    if (i ==0){
+                        qnstr = q.getQn();
+                    }else{
+                        qnstr = qnstr + "," + q.getQn();
+                    }
+
+
+                    //获取指定试题试题得分
+                    List<EPaperStudentQuestion> qstu = stulist.stream().filter(o -> o.getEpid().equals(t.getEpid())
+                             && o.getEptqid().equals(q.getEptqid())).collect(Collectors.toList());
+                    if(i == 0){
+                        stunum = qstu.size();
+                    }
+                    EPaperStudentQuestion maxscoreStu = qstu.stream().max(Comparator.comparing(EPaperStudentQuestion::getStuscore)).get();//最高分
+                    Double qgscore = qstu.stream().mapToDouble(EPaperStudentQuestion::getStuscore).sum();
+                    Double qgavgscore = N_Utils.getDoubleDivideAndMulitiply(qgscore,qstu.size());//年级平均分
+                    Double qgsrate = N_Utils.getDoubleDivideAndMulitiply(qgscore,q.getScore() * qstu.size());
+                    tgscore = ExamUtil.add(tgscore,qgscore);
+
+                    for(Map classm : classes){
+                        Integer classid = Integer.parseInt(classm.get("classid").toString());
+                        List<EPaperStudentQuestion> classStu = qstu.stream().filter(o -> o.getClassid().equals(classid)).collect(Collectors.toList());
+                        EPaperStudentQuestion maxclassstu = classStu.stream().max(Comparator.comparing(EPaperStudentQuestion::getStuscore)).get();//最高分
+                        Double qallstu = classStu.stream().mapToDouble(EPaperStudentQuestion::getStuscore).sum();
+                        Double qcavgscore = N_Utils.getDoubleDivideAndMulitiply(qallstu,classStu.size());//年级平均分
+                        Double qcsrate = N_Utils.getDoubleDivideAndMulitiply(qallstu,q.getScore() * classStu.size());
+
+                        ERclassQuestion ercq = new ERclassQuestion();
+                        ercq.setExamid(examid);
+                        ercq.setClassid(classid);
+                        ercq.setSubjectid(subjectid);
+                        ercq.setEptqid(q.getEptqid());
+                        ercq.setQn(q.getQn());
+                        ercq.setQorder(q.getQorder());
+                        if(ptype == 1){
+                            ercq.setComplexity(q.getComplexity());
+                        }
+                        ercq.setClassmaxscore(maxclassstu.getStuscore());
+                        ercq.setClassavgscore(qcavgscore);
+                        ercq.setClasssrate(qcsrate);
+                        ercq.setGrademaxscore(maxscoreStu.getStuscore());
+                        ercq.setGradeavgscore(qgavgscore);
+                        ercq.setGradesrate(qgsrate);
+                        //处理单选题选项情况
+                        Map stuansmap = setPaperQuestionsForStu(q,classStu);
+                        ercq.setAnswerjson(stuansmap.get("answerlist").toString());
+                        ercq.setGoodstujson(stuansmap.get("goodlist").toString());
+                        ercq.setBadstujson(stuansmap.get("badlist").toString());
+                        rqlist.add(ercq);//单个试题统计
+
+                        if(tcmap.containsKey(classid)){
+                            ERClassScoreVo erClassScoreVo = tcmap.get(classid);
+                            if(i ==0){
+                                erClassScoreVo.setStunum(classStu.size());
+                                erClassScoreVo.setTcscore(0.0);
+                            }
+                            erClassScoreVo.setTcscore(ExamUtil.add(erClassScoreVo.getTcscore(), qallstu));
+
+                        }else{
+                            ERClassScoreVo erClassScoreVo = new ERClassScoreVo();
+                            erClassScoreVo.setStunum(classStu.size());
+                            erClassScoreVo.setTcscore(0.0);
+                            erClassScoreVo.setTcscore(ExamUtil.add(erClassScoreVo.getTcscore(), qallstu));
+                            tcmap.put(classid,erClassScoreVo);
+                        }
+
+                    }
+
+                }
+
+
+                Double tgavescore = N_Utils.getDoubleDivideAndMulitiply(tgscore,stunum);//题型下年级平均分
+                Double tgsrate = N_Utils.getDoubleDivideAndMulitiply(tgscore,eptscore * stunum);//年级得分率
+
+                for(Map.Entry<Integer,ERClassScoreVo> entry : tcmap.entrySet()){
+                    ERClassScoreVo erClassScoreVo = entry.getValue();
+                    ERclassQtype eRclassQtype = new ERclassQtype();
+                    eRclassQtype.setExamid(examid);
+                    eRclassQtype.setSubjectid(subjectid);
+                    eRclassQtype.setEpid(epid);
+                    eRclassQtype.setClassid(entry.getKey());
+                    eRclassQtype.setQtypename(t.getEptname());
+                    eRclassQtype.setQn(t.getEptorder().toString());
+                    eRclassQtype.setScore(eptscore);
+                    eRclassQtype.setNum(t.getEptnum());
+                    eRclassQtype.setSrate(N_Utils.getDoubleDivideAndMulitiply(eptscore,pscore));
+                    eRclassQtype.setGradeavgscore(tgavescore);
+                    eRclassQtype.setGradesrate(tgsrate);
+                    eRclassQtype.setClassavgscore(N_Utils.getDoubleDivideAndMulitiply(erClassScoreVo.getTcscore(),erClassScoreVo.getStunum()));
+                    eRclassQtype.setClasssrate(N_Utils.getDoubleDivideAndMulitiply(erClassScoreVo.getTcscore(),eptscore * erClassScoreVo.getStunum() ));
+                    eRclassQtype.setQn(qnstr);
+
+                    rtypelist.add(eRclassQtype);
+                }
+            }
+        }
+        eRclassQtypeMapper.insertList(rtypelist);
+        eRclassQuestionMapper.insertList(rqlist);
+    }
+    //处理题库试卷中子母题
+    private void setEPaperQtypeForQues(List<EPaperQtypeVo> fjtypelist){
+        for(EPaperQtypeVo qt : fjtypelist){
+            List<EPaperQtypeQuestionVo> qlist = qt.getQuestions();
+            List<EPaperQtypeQuestionVo> rtnqlist = new ArrayList<>();//保存处理后的试题
+            String qpid = "";//母题id
+            List<EPaperQtypeQuestionVo> sonqlist = new ArrayList<>();
+            for(EPaperQtypeQuestionVo q : qlist){
+                //试题类型1单题2母题3子题
+                if(q.getQlevel() == 3){
+                    if(!q.getQuestionpid().equals(qpid)){
+                        sonqlist = qlist.stream().filter(o -> o.getQuestionpid().equals(q.getQuestionpid())).collect(Collectors.toList());
+                        EPaperQtypeQuestionVo mq = new EPaperQtypeQuestionVo();
+                        mq.setQuestionid(q.getQuestionpid());
+                        mq.setCtype(q.getMctype());
+                        mq.setQtypeid(q.getMqtypeid());
+                        mq.setQtypename(q.getMqtypename());
+                        mq.setQstem(q.getMqstem());
+                        mq.setComplexity(q.getMcomplexity());
+                        mq.setQanalyze(q.getMqanalyze());
+                        mq.setQanswer(q.getMqanswer());
+                        mq.setQorder(q.getQorder());
+                        mq.setQlevel(q.getMqlevel());
+                        List<EPaperQPointVo> allpoint = new ArrayList<>();
+                        for(EPaperQtypeQuestionVo sq : sonqlist){
+                            List<EPaperQPointVo> sqpoints = sq.getPoints();
+                            for(EPaperQPointVo p : sqpoints){
+                                if(!isExistEPaperPoints(allpoint,p)){
+                                    allpoint.add(p);
+                                }
+                            }
+                        }
+                        Double mscore = sonqlist.stream().collect(Collectors.summingDouble(EPaperQtypeQuestionVo:: getScore));
+                        mq.setScore(mscore);
+                        mq.setSonques(sonqlist);
+                        mq.setPoints(allpoint);
+                        rtnqlist.add(mq);
+                    }
+                    qpid = q.getQuestionpid();
+                }else{
+                    EPaperQtypeQuestionVo mq = new EPaperQtypeQuestionVo();
+                    BeanUtils.copyProperties(q,mq);
+                    mq.setCtype(mq.getCtype());
+                    rtnqlist.add(mq);
+                }
+            }
+            qt.setQuestions(rtnqlist);
+        }
+
+    }
+    private boolean isExistEPaperPoints(List<EPaperQPointVo> allpoint,EPaperQPointVo p){
+        for(EPaperQPointVo pvo : allpoint){
+            if(p.getPointid().equals(pvo.getPointid())){
+                return true;
+            }
+        }
+        return false;
+    }
+    //处理学生选项情况和得分情况
+    private Map setPaperQuestionsForStu(EPaperQtypeQuestionVo q,List<EPaperStudentQuestion> classStu){
+        Map<String,List<Map>> answermap = new HashMap<>();
+        List<Map> goodlist = new ArrayList<>();
+        List<Map> badlist = new ArrayList<>();
+
+        Double score8 = 0.0;
+        Double score5 = 0.0;
+        String key1 = "";
+        String key2 = "";
+        String key3 = "";
+
+        for(int i=0;i<classStu.size();i++){
+            EPaperStudentQuestion sq = classStu.get(i);
+            String stuanswer = sq.getStuanswer();
+            if(q.getCtype() == 1 || q.getCtype() == 2 || q.getCtype() == 4 || q.getCtype() == 5 || q.getCtype() == 6){
+                String answeroption = "未选择";
+                if(N_Utils.isNotEmpty(stuanswer)){
+                    List<String> stuanswers = JSON.parseArray(stuanswer,String.class);
+                    answeroption = stuanswers.get(0);
+                }
+
+                Map stumap = new HashMap();
+                stumap.put("studentid",sq.getStudentid());
+                stumap.put("stuname",sq.getStuname());
+                if(answermap.containsKey(answeroption)){
+                   List<Map> stulist = answermap.get(answeroption);
+                   stulist.add(stumap);
+                }else{
+                    List<Map> stulist = new ArrayList<>();
+                    stulist.add(stumap);
+                    answermap.put(answeroption,stulist);
+                }
+            }else{
+                //主观题
+                if(i==0){
+                    //处理分数分段对应,用于分数段[0，50%）   [50%，80%）,  [80%，100%]
+                    score8 = ExamUtil.getScoreRateScore(q.getScore(),0.8);
+                    score5 = ExamUtil.getScoreRateScore(q.getScore(),0.8);
+                    key1 = score8+"-"+q.getScore();
+                    key2 = score8 + "-" + score5;
+                    key3 = score5 + "-" + 0;
+                    answermap.put(key1,new ArrayList<>());
+                    answermap.put(key2,new ArrayList<>());
+                    answermap.put(key3,new ArrayList<>());
+                }
+
+                List<Map> stulist = null;
+                if(sq.getStuscore()>=score8){
+                    stulist = answermap.get(key1);
+                }else if(sq.getStuscore() >= score5 && sq.getStuscore()<score8){
+                    stulist = answermap.get(key2);
+                }else{
+                    stulist = answermap.get(key3);
+                }
+
+                Map stumap = new HashMap();
+                stumap.put("studentid",sq.getStudentid());
+                stumap.put("stuname",sq.getStuname());
+                stulist.add(stumap);
+            }
+
+            if(sq.getGood() == 1){
+                Map goodmap = new HashMap();
+                goodmap.put("studentid",sq.getStudentid());
+                goodmap.put("stuname",sq.getStuname());
+                goodlist.add(goodmap);
+            }
+            if(sq.getBad() == 1){
+                Map badmap = new HashMap();
+                badmap.put("studentid",sq.getStudentid());
+                badmap.put("stuname",sq.getStuname());
+                badlist.add(badmap);
+            }
+        }
+
+        Map rtnmap = new HashMap();
+        rtnmap.put("answerlist",JSON.toJSONString(answermap));
+        rtnmap.put("goodlist",JSON.toJSONString(goodlist));
+        rtnmap.put("badlist",JSON.toJSONString(badlist));
+        return rtnmap;
+    }
 }

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

@@ -119,4 +119,17 @@ public class ExamUtil {
         return biginta.subtract(bigintb).longValue();
 
     }
+
+    /**
+     * 分数百分比
+     * @param v1 分数
+     * @param v2 占比如80%写作0.8
+     * @return
+     */
+    public static double getScoreRateScore(double v1, double v2) {
+        BigDecimal b1 = new BigDecimal(Double.toString(v1));
+        BigDecimal b2 = new BigDecimal(Double.toString(v2));
+
+        return b1.multiply(b2).setScale(0,BigDecimal.ROUND_HALF_UP).doubleValue();
+    }
 }

sexam/src/main/java/com/xhkjedu/sexam/vo/paper/EPaperQtypeQuestionVo.java

@@ -24,6 +24,9 @@ public class EPaperQtypeQuestionVo {
     //试题分值
     private Double score;
 
+    //题号
+    private String qn;
+
     //试题排序
     private Integer qorder;
 
@@ -36,7 +39,8 @@ public class EPaperQtypeQuestionVo {
     //试题题型名称
     private String qtypename;
 
-    private String answer;//试卷中设置的答案
+    //试卷中设置的答案
+    private String answer;
 
     //试题题干
     private String qstem;

sexam/src/main/java/com/xhkjedu/sexam/vo/paper/EPaperQtypeVo.java

@@ -12,6 +12,7 @@ import java.util.List;
  **/
 @Data
 public class EPaperQtypeVo {
+    private Integer epid;
     //考试试卷题型表
     private Integer eptid;
 

sexam/src/main/java/com/xhkjedu/sexam/vo/report/ERClassScoreVo.java

@@ -0,0 +1,10 @@
+package com.xhkjedu.sexam.vo.report;
+
+import lombok.Data;
+
+@Data
+public class ERClassScoreVo {
+    private Integer stunum;//学生数量
+
+    private Double tcscore = 0.0;//班级得分
+}

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

@@ -5,6 +5,7 @@
     <!--试卷题型试题信息(题库)-->
     <resultMap id="qtypesQuestion" type="com.xhkjedu.sexam.vo.paper.EPaperQtypeVo">
         <result column="eptid" property="eptid"></result>
+        <result column="epid" property="epid"></result>
         <result column="ctype" property="ctype"></result>
         <result column="eptname" property="eptname"></result>
         <result column="eptnum" property="eptnum"></result>
@@ -16,6 +17,7 @@
             <result column="questionid" property="questionid"></result>
             <result column="score" property="score"></result>
             <result column="qorder" property="qorder"></result>
+            <result column="qn" property="qn"></result>
             <result column="qtypeid" property="qtypeid"></result>
             <result column="qtypename" property="qtypename"></result>
             <result column="answer" property="answer"></result>
@@ -47,7 +49,7 @@
     <!--试题详情-->
     <select id="listPaperQtypeQuestions" resultMap="qtypesQuestion">
         select t.eptid,t.epid,t.ctype,t.eptname,t.eptnum,t.eptorder,t.eptscore,tq.eptqid,tq.questionid,tq.answer,
-               tq.score,tq.qorder,q.qtypeid,q.qtypename,q.ctype qctype,q.qstem,q.qoption,q.qanswer,q.qanalyze,
+               tq.score,tq.qn,tq.qorder,q.qtypeid,q.qtypename,q.ctype qctype,q.qstem,q.qoption,q.qanswer,q.qanalyze,
                q.complexity,q.qlevel,q.sorder,q.questionpid,fq.snum,fq.qstem as mqstem,fq.complexity as mcomplexity,
                fq.qtypeid mqtypeid,fq.qtypename mqtypename,fq.ctype mctype,fq.qanalyze mqanalyze,fq.qanswer mqanswer,
                fq.qlevel mqlevel
@@ -66,6 +68,7 @@
     <!--试卷题型试题信息（附件）-->
     <resultMap id="fjtypeQuestions" type="com.xhkjedu.sexam.vo.paper.EPaperQtypeVo">
         <result column="eptid" property="eptid"></result>
+        <result column="epid" property="epid"></result>
         <result column="ctype" property="ctype"></result>
         <result column="eptname" property="eptname"></result>
         <result column="eptnum" property="eptnum"></result>

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

@@ -135,4 +135,11 @@
         where epsid=#{epsid} and studentid=#{studentid}
     </update>
 
+    <!--报告生成-学生试卷-->
+    <select id="listExamStudentsAnswer" resultType="com.xhkjedu.sexam.model.paperstudent.EPaperStudentQuestion">
+        select q.epsqid,q.classid,q.studentid,q.epid,q.eptqid,q.qn,q.answertype,q.stuanswer,q.qscore,q.stuscore,q.good,q.bad,u.username stuname
+        from e_paper_student_question q left join e_paper_student s on s.epsid=q.epsid
+        left join t_user u on q.studentid=u.userid where s.examid=#{examid} and s.sstate=2 group by q.epsqid
+    </select>
+
 </mapper>

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

@@ -3,7 +3,8 @@
 <mapper namespace="com.xhkjedu.sexam.mapper.report.EReportGenerateMapper">
     <!--考试科目-->
     <select id="listSubject" resultType="java.util.Map">
-        select subjectid,subjectname from e_subject where examid=#{examid}
+        select s.subjectid,s.subjectname,p.epid,p.ptype,p.pscore from e_subject s left join e_paper p on s.esid=p.esid
+        where s.examid=#{examid} order by s.esid
     </select>
     <!--考试试卷-->
     <select id="listPaper" resultType="com.xhkjedu.sexam.vo.report.ERPaperVo">