Merge remote-tracking branch 'cloud-schoolapi/ywx'

sexam/src/main/java/com/xhkjedu/sexam/controller/exam/EBaseController.java

         return new ResultVo(0, "设置成功");
     }
 
+    /*
+     * 处理班级试题作答详情和满分
+     * @Param []
+     * @Author ywx
+     * @Date 2022/11/23 15:13
+     * @return com.xhkjedu.vo.ResultVo
+     **/
+    @PostMapping("/handle_answerjson")
+    public ResultVo handleAnswerjson() {
+        eReportGenerateService.handleAnswerjson();
+        return new ResultVo(0, "设置成功");
+    }
 }

sexam/src/main/java/com/xhkjedu/sexam/mapper/exam/EBaseMapper.java

     EBaseVo getExamStateAndMode(@Param("examid") Integer examid);
 
     //根据考试id获取显示排名
-    Integer getShowRankById(@Param("examid") Integer examid);
+    EBase getShowRankById(@Param("examid") Integer examid);
 }

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

 package com.xhkjedu.sexam.mapper.report;
 
+import com.xhkjedu.sexam.model.exam.EClass;
+import com.xhkjedu.sexam.model.reportclass.ERclassQuestion;
 import com.xhkjedu.sexam.model.reportstu.ERstudent;
 import org.apache.ibatis.annotations.Param;
 
 
     //根据考试id获取考试模式
     Integer getExamModeById(@Param("examid") Integer examid);
+
+    //获取未处理的学生作答情况
+    List<ERclassQuestion> listAnswerJson();
+
+    //获取复合题满分人数
+    Integer getFullscorenum(@Param("q") ERclassQuestion q);
+
+    //获取考试班级集合
+    List<EClass> listClassByExamIds(@Param("examids") List<Integer> examids);
+
+    //更新班级试题作答详情和满分
+    void updateClassQuestion(@Param("q") ERclassQuestion q);
 }

sexam/src/main/java/com/xhkjedu/sexam/model/exam/EBase.java

     //考试状态0未开始1已开始2已结束3已生成报告
     private Integer examstate;
 
-    //显示排名0不显示1显示
-    private Integer showrank;
+    //教师显示排名得分0保密1分数2分数+班排名3分数+校排名
+    private Integer teashowrank;
+
+    //学生显示排名得分0保密1分数2分数+班排名3分数+校排名
+    private Integer stushowrank;
 
     //考试公告
     private String examcomm;

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

 
     //违规学生
     private String badstujson;
+
+    //满分人数
+    private Integer fullscorenum;
 }

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

         try {
             //考试
             model.setExamstate(0);
-            model.setShowrank(0);
+            model.setTeashowrank(0);
+            model.setStushowrank(0);
             model.setDeleted(1);
             model.setReportstate(0);
             model.setCreatetime(N_Utils.getSecondTimestamp());
 
     //设置学生报告排名显示
     public void setShowRank(EBase eBase) {
-        if (eBase.getShowrank() == null) eBase.setShowrank(0);
+        if (eBase.getTeashowrank() == null) eBase.setTeashowrank(0);
+        if (eBase.getStushowrank() == null) eBase.setStushowrank(0);
         eBaseMapper.updateByPrimaryKeySelective(eBase);
     }
 }

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

 import com.xhkjedu.sexam.mapper.reportclass.*;
 import com.xhkjedu.sexam.mapper.reportstu.*;
 import com.xhkjedu.sexam.mapper.system.UserMapper;
+import com.xhkjedu.sexam.model.exam.EClass;
 import com.xhkjedu.sexam.model.paperstudent.EPaperStudentQuestion;
 import com.xhkjedu.sexam.model.report.ERbase;
 import com.xhkjedu.sexam.model.report.ERrank;
 import com.xhkjedu.sexam.vo.report.ExamPaperClassVo;
 import com.xhkjedu.sexam.vo.system.UserVo;
 import com.xhkjedu.utils.N_Utils;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
  * @date 2022/8/8 10:04
  **/
 @Service
+@Slf4j
 public class EReportGenerateService {
     @Resource
     private EReportGenerateMapper eReportGenerateMapper;
         String key2 = "";
         String key3 = "";
 
-        for (int i = 0; i < classStu.size(); i++) {
+        Double qscore = q.getQscore();
+        int stunum = classStu.size();
+        for (int i = 0; i < stunum; 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) {
                 if (i == 0) {
                     answermap = new LinkedHashMap<>();
                     //处理分数分段对应,用于分数段[0，50%）   [50%，80%）,  [80%，100%]
-                    score8 = ExamUtil.getScoreRateScore(q.getQscore(), 0.8);
-                    score5 = ExamUtil.getScoreRateScore(q.getQscore(), 0.5);
-                    String str10 = N_Utils.formatDouble(q.getQscore());
+                    score8 = ExamUtil.getScoreRateScore(qscore, 0.8);
+                    score5 = ExamUtil.getScoreRateScore(qscore, 0.5);
+                    String str10 = N_Utils.formatDouble(qscore);
                     String str8 = N_Utils.formatDouble(score8);
                     String str5 = N_Utils.formatDouble(score5);
                     key1 = str8 + "-" + str10;
             }
         }
 
+        List<Map> dafblist = new ArrayList<>();//答案分布
+        Map<String, Map> dafbmap = new HashMap<>();//答案分布
+        for (Map.Entry<String, List<Map>> entry : answermap.entrySet()) {
+            String key = entry.getKey();
+            List<Map> students = entry.getValue();
+            Map dafb = new HashMap();
+            int num = students.size();
+            dafb.put("students", students);
+            dafb.put("num", num);
+            dafb.put("numrate", N_Utils.getIntegerDivideAndMulitiply(num, stunum));
+            dafbmap.put(key, dafb);
+        }
+
         Map rtnmap = new HashMap();
-        rtnmap.put("answerlist", JSON.toJSONString(answermap));
+        rtnmap.put("answerlist", JSON.toJSONString(dafbmap));
+        long fullscorenum = classStu.stream().filter(c -> qscore.equals(c.getStuscore())).count();
+        rtnmap.put("fullscorenum", fullscorenum);
+        rtnmap.put("dafbjson", JSON.toJSONString(dafblist));
         rtnmap.put("goodlist", JSON.toJSONString(goodlist));
         rtnmap.put("badlist", JSON.toJSONString(badlist));
         rtnmap.put("erroroption",erroroption);
                         ercq.setGradesrate(qgsrate);
                         //处理单选题选项情况
                         Map stuansmap = setPaperQuestionsForStuAnswer(qcstulist);
+                        ercq.setFullscorenum(N_Utils.str2Int(stuansmap.get("fullscorenum").toString()));
                         ercq.setAnswerjson(stuansmap.get("answerlist").toString());
                         if(N_Utils.isNotEmpty(stuansmap.get("goodlist"))){
                             ercq.setGoodstujson(stuansmap.get("goodlist").toString());
                         ercq.setGradesrate(N_Utils.getDoubleDivideAndMulitiply(qgstuscore,qgscore));
                         //处理单选题选项情况
                         Map stuansmap = setPaperQuestionsForStuAnswer(qcstulist);
+                        ercq.setFullscorenum(N_Utils.str2Int(stuansmap.get("fullscorenum").toString()));
                         ercq.setAnswerjson(stuansmap.get("answerlist").toString());
                         if(N_Utils.isNotEmpty(stuansmap.get("goodlist"))){
                             ercq.setGoodstujson(stuansmap.get("goodlist").toString());
             }
         }
     }
+
+    //处理班级试题作答详情和满分
+    public void handleAnswerjson() {
+        List<ERclassQuestion> list = eReportGenerateMapper.listAnswerJson();//获取未处理的学生作答情况
+        List<Integer> examids = list.stream().map(l -> l.getExamid()).distinct().collect(Collectors.toList());
+        List<EClass> classes = eReportGenerateMapper.listClassByExamIds(examids);//获取考试班级集合
+        Map<String, Integer> classMap = classes.stream().collect(Collectors.toMap(
+                c -> c.getExamid() + "_" + c.getClassid(), c -> c.getClassnum()));
+        for (ERclassQuestion q : list) {
+            new Thread(()->{
+                try {
+                    updateClassQuestion(classMap, q);
+                }catch (Exception e){
+                    log.error("处理单个班级试题重试：" + e.getMessage());
+                    try {
+                        updateClassQuestion(classMap, q);
+                    }catch (Exception se){
+                        log.error("处理单个班级试题重试出错：" + se.getMessage());
+                    }
+                }
+            }).start();
+        }
+    }
+
+    //处理单个班级试题
+    private void updateClassQuestion(Map<String, Integer> classMap, ERclassQuestion q) {
+        if (N_Utils.isEmptyInteger(q.getEptqid())) {
+            Integer fullscorenum = eReportGenerateMapper.getFullscorenum(q);
+            q.setFullscorenum(fullscorenum);
+        }
+        Integer stunum = classMap.get(q.getExamid() + "_" + q.getClassid());
+        Map<String, Map> dafbmap = new HashMap<>();//答案分布
+        Map<String, List<Map>> answer = JSON.parseObject(q.getAnswerjson(), Map.class);
+        for (Map.Entry<String, List<Map>> entry : answer.entrySet()) {
+            String key = entry.getKey();
+            List<Map> students = entry.getValue();
+            int num = students.size();
+            Map dafb = new HashMap();
+            dafb.put("students", students);
+            dafb.put("num", num);
+            dafb.put("numrate", N_Utils.getIntegerDivideAndMulitiply(num, stunum));
+            dafbmap.put(key, dafb);
+        }
+        q.setAnswerjson(JSON.toJSONString(dafbmap));
+        eReportGenerateMapper.updateClassQuestion(q);
+    }
 }

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

 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.model.exam.EBase;
 import com.xhkjedu.sexam.utils.ExamUtil;
 import com.xhkjedu.utils.N_Utils;
 import org.springframework.stereotype.Service;
      **/
     public Map listStudentSubjectScoreByExamid(Integer examid, Integer studentid, Integer teacherid) {
         Integer showrank;
+        EBase base = eBaseMapper.getShowRankById(examid);
         if (!N_Utils.isEmptyInteger(teacherid)) {
-            showrank = 1;
+            showrank = base.getTeashowrank();
         } else {
-            showrank = eBaseMapper.getShowRankById(examid);
+            showrank = base.getStushowrank();
         }
         List<Map> list = eRstudentMapper.getStudentScoreByExamid(examid, studentid, showrank);
         Map rtnmap = new LinkedHashMap();
         if (list != null && list.size() > 0) {
             String classnum = "0";
             String gradenum = "0";
-            if (showrank == 1) {
+            if (showrank != 0) {
                 Map map1 = list.get(0);
                 Integer classid = Integer.parseInt(map1.get("classid").toString());
                 Map gcnum = eRstudentMapper.getStudentNumByExamid(examid, classid);
      **/
     public List<Map> listStudentRankHistory(Integer studentid, Integer examid, Integer teacherid) {
         Integer showrank;
+        EBase base = eBaseMapper.getShowRankById(examid);
         if (!N_Utils.isEmptyInteger(teacherid)) {
-            showrank = 1;
+            showrank = base.getTeashowrank();
         } else if (N_Utils.isEmptyInteger(examid)) {
             showrank = 0;
         } else {
-            showrank = eBaseMapper.getShowRankById(examid);
+            showrank = base.getStushowrank();
         }
         if (showrank == 0) return new ArrayList<>();
         return eRstudentMapper.listStudentExamHistory(studentid, "zf");
      **/
     public Map getSubjectScoreByStudentid(Integer examid, Integer studentid, String subjectid, Integer teacherid) {
         Integer showrank;
+        EBase base = eBaseMapper.getShowRankById(examid);
         if (!N_Utils.isEmptyInteger(teacherid)) {
-            showrank = 1;
+            showrank = base.getTeashowrank();
         } else {
-            showrank = eBaseMapper.getShowRankById(examid);
+            showrank = base.getStushowrank();
         }
         Map rtnmap = eRstudentMapper.getSubjectScoreByStudentid(examid, studentid, subjectid, showrank);
         if (rtnmap != null && rtnmap.size() > 0) {
      **/
     public List<Map> listSubjectPoints(Integer examid, Integer studentid, String subjectid, Integer teacherid) {
         Integer showrank;
+        EBase base = eBaseMapper.getShowRankById(examid);
         if (!N_Utils.isEmptyInteger(teacherid)) {
-            showrank = 1;
+            showrank = base.getTeashowrank();
         } else {
-            showrank = eBaseMapper.getShowRankById(examid);
+            showrank = base.getStushowrank();
         }
         return eRstudentMapper.listSubjectPoints(examid, studentid, subjectid, showrank);
     }
      **/
     public List<Map> listSubjectComplexitys(Integer examid, Integer studentid, String subjectid, Integer teacherid) {
         Integer showrank;
+        EBase base = eBaseMapper.getShowRankById(examid);
         if (!N_Utils.isEmptyInteger(teacherid)) {
-            showrank = 1;
+            showrank = base.getTeashowrank();
         } else {
-            showrank = eBaseMapper.getShowRankById(examid);
+            showrank = base.getStushowrank();
         }
         return eRstudentMapper.listSubjectComplexitys(examid, studentid, subjectid, showrank);
     }
      **/
     public List<Map> listSubjectQtypes(Integer examid, Integer studentid, String subjectid, Integer teacherid) {
         Integer showrank;
+        EBase base = eBaseMapper.getShowRankById(examid);
         if (!N_Utils.isEmptyInteger(teacherid)) {
-            showrank = 1;
+            showrank = base.getTeashowrank();
         } else {
-            showrank = eBaseMapper.getShowRankById(examid);
+            showrank = base.getStushowrank();
         }
         return eRstudentMapper.listSubjectQtypes(examid, studentid, subjectid, showrank);
     }
      **/
     public List<Map> listSubjectQuestions(Integer examid, Integer studentid, String subjectid, Integer teacherid) {
         Integer showrank;
+        EBase base = eBaseMapper.getShowRankById(examid);
         if (!N_Utils.isEmptyInteger(teacherid)) {
-            showrank = 1;
+            showrank = base.getTeashowrank();
         } else {
-            showrank = eBaseMapper.getShowRankById(examid);
+            showrank = base.getStushowrank();
         }
         Map map = ePaperMapper.getPaperByExamidAndSubjectid(examid, subjectid);
         Integer ptype = Integer.parseInt(map.get("ptype").toString());
     public Map getStudentPaperQuestions(Integer examid, Integer studentid, String subjectid, Integer teacherid) {
         Integer showrank;
         Integer pstate = eSubjectMapper.getPstateByExamIdSid(examid, subjectid);
+        EBase base = eBaseMapper.getShowRankById(examid);
         if (!N_Utils.isEmptyInteger(teacherid)) {
-            showrank = 1;
+            showrank = base.getTeashowrank();
         } else {
-            showrank = eBaseMapper.getShowRankById(examid);
+            showrank = base.getStushowrank();
         }
         Map map = ePaperMapper.getPaperByExamidAndSubjectid(examid, subjectid);
         Integer ptype = Integer.parseInt(map.get("ptype").toString());
      **/
     public List<Map> listStudentSubjectErrorQues(Integer examid, Integer studentid, Integer teacherid) {
         Integer showrank;
+        EBase base = eBaseMapper.getShowRankById(examid);
         if (!N_Utils.isEmptyInteger(teacherid)) {
-            showrank = 1;
+            showrank = base.getTeashowrank();
         } else {
-            showrank = eBaseMapper.getShowRankById(examid);
+            showrank = base.getStushowrank();
         }
         List<Map> list = eRstudentMapper.listStudentSubjectErrorQues(examid, studentid, showrank);
         if (showrank == 0) return list;
     public Map listStudentErrorQuestionsTk(Integer examid, Integer studentid, String subjectid, Integer teacherid) {
         Integer pstate = eSubjectMapper.getPstateByExamIdSid(examid, subjectid);
         Integer showrank;
+        EBase base = eBaseMapper.getShowRankById(examid);
         if (!N_Utils.isEmptyInteger(teacherid)) {
-            showrank = 1;
+            showrank = base.getTeashowrank();
         } else {
-            showrank = eBaseMapper.getShowRankById(examid);
+            showrank = base.getStushowrank();
         }
         if (showrank == 0) {
             Map map = new HashMap();
      **/
     public List<Map> listStudentErrorQuestionsFj(Integer examid, Integer studentid, String subjectid, Integer teacherid) {
         Integer showrank;
+        EBase base = eBaseMapper.getShowRankById(examid);
         if (!N_Utils.isEmptyInteger(teacherid)) {
-            showrank = 1;
+            showrank = base.getTeashowrank();
         } else {
-            showrank = eBaseMapper.getShowRankById(examid);
+            showrank = base.getStushowrank();
         }
         if (showrank == 0) return new ArrayList<>();
         List<Map> list = eRstudentMapper.listStudentErrorQuestionsForFj(examid, studentid, subjectid);

sexam/src/main/resources/mapper/exam/EBaseMapper.xml

     </delete>
     <!--考试列表-->
     <select id="listAll" resultType="java.util.Map">
-        select b.examid,b.examname,b.examdate,b.gradeid,b.examtype,b.exammode,b.monitored,b.showrank
+        select b.examid,b.examname,b.examdate,b.gradeid,b.examtype,b.exammode,b.monitored,b.teashowrank,b.stushowrank
         ,b.examstate,u.username createname,group_concat(distinct es.subjectname order by es.esid separator '|')subjectname
         ,count(distinct case when es.begintime is null or es.begintime='' then es.esid else null end)esnum
         ,min(es.esstate)esstate,min(es.pstate)pstate,min(ifnull(ep.correcttype,0))correcttype
     </update>
     <!--考试基本信息-->
     <select id="findById" resultType="java.util.Map">
-        select examid,examname,gradeid,examdate,examtype,exammode,monitored,examstate,showrank
+        select examid,examname,gradeid,examdate,examtype,exammode,monitored,examstate,teashowrank,stushowrank
         from e_base where examid=#{examid}
     </select>
     <!--考试基本信息(带考试人数)-->
     <select id="findById2" resultType="java.util.Map">
-        select b.examid,b.examname,b.examdate,b.examtype,b.gradeid,b.exammode,b.monitored,b.examstate,b.examcomm,showrank
+        select b.examid,b.examname,b.examdate,b.examtype,b.gradeid,b.exammode,b.monitored,b.examstate,b.examcomm
+        ,teashowrank,stushowrank
         ,(select sum(c.classnum) from e_class c where c.examid=b.examid)examnum
         from e_base b where b.examid=#{examid}
     </select>
         from e_base eb where eb.examid=#{examid}
     </select>
     <!--根据考试id获取显示排名-->
-    <select id="getShowRankById" resultType="java.lang.Integer">
-        select eb.showrank
+    <select id="getShowRankById" resultType="com.xhkjedu.sexam.model.exam.EBase">
+        select eb.teashowrank,eb.stushowrank
         from e_base eb where eb.examid=#{examid}
     </select>
 </mapper>

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

     <!--试卷概况-题库-->
     <select id="listTkSjGk" resultType="java.util.Map">
         select erq.qn,erq.qorder,erq.classavgscore,erq.classsrate,erq.gradeavgscore,erq.gradesrate,erq.classratetype
-        ,erq.answerjson,erq.goodstujson,erq.badstujson,erq.questionid,erq.eptqid,erq.complexity,erq.score
+        ,erq.answerjson,erq.fullscorenum,erq.goodstujson,erq.badstujson,erq.questionid,erq.eptqid,erq.complexity,erq.score
         from e_rclass_question erq
         where erq.examid=#{rank.examid} and erq.classid=#{rank.classid}
         and erq.subjectid=#{rank.subjectid}
     <!--试卷概况-附件-->
     <select id="listFjSjGk" resultType="java.util.Map">
         select erq.qn,erq.qorder,erq.classavgscore,erq.classsrate,erq.gradeavgscore,erq.gradesrate
-        ,erq.answerjson,erq.goodstujson,erq.badstujson,erq.eptqid,erq.classratetype
+        ,erq.answerjson,erq.fullscorenum,erq.goodstujson,erq.badstujson,erq.eptqid,erq.classratetype
         ,epqq.ctype,epqq.score,epqq.answer,epqq.qtypename,epqq.optionnum
         from e_rclass_question erq left join e_paper_qtype_question epqq on erq.eptqid = epqq.eptqid
         where erq.examid=#{rank.examid} and erq.classid=#{rank.classid}
     <select id="listQuestion" resultType="java.util.Map">
         select erq.eptqid,erq.qn,erq.qorder,erq.score,erq.qtypename,erq.complexity
         ,erq.classavgscore,erq.classsrate,erq.gradeavgscore,erq.gradesrate
+        ,erq.answerjson,erq.fullscorenum
         from e_rclass_question erq
         where erq.examid=#{rank.examid} and erq.classid=#{rank.classid}
         and erq.subjectid=#{rank.subjectid}

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

     <select id="getExamModeById" resultType="java.lang.Integer">
         select exammode from e_base where examid=#{examid}
     </select>
+    <!--获取未处理的学生作答情况-->
+    <select id="listAnswerJson" resultType="com.xhkjedu.sexam.model.reportclass.ERclassQuestion">
+        select q.answerjson,q.rcqid,q.examid,q.epid,q.classid,q.qn,q.score,q.eptqid
+        ,(case when q.eptqid is not null then (select count(*) from e_paper_student_question s
+        where s.eptqid=q.eptqid and s.qscore=s.stuscore)
+        else 0 end)fullscorenum
+        from e_rclass_question q where q.answerjson not like '%numrate%'
+    </select>
+    <!--获取复合题满分人数-->
+    <select id="getFullscorenum" resultType="java.lang.Integer">
+        select count(*) from(select sum(s.stuscore)sscore,s.studentid
+        from e_paper_student_question s where s.epid=#{q.epid} and find_in_set(s.qn,#{q.qn})
+        group by s.studentid )a where a.sscore=#{q.score}
+    </select>
+    <!--获取考试班级集合-->
+    <select id="listClassByExamIds" resultType="com.xhkjedu.sexam.model.exam.EClass">
+        select ec.classid,ec.classnum,ec.examid from e_class ec where ec.examid in
+        <foreach collection="examids" item="examid" open="(" separator="," close=")">#{examid}</foreach>
+    </select>
+    <!--更新班级试题作答详情和满分-->
+    <update id="updateClassQuestion">
+        update e_rclass_question set answerjson=#{q.answerjson},fullscorenum=#{q.fullscorenum} where rcqid=#{q.rcqid}
+    </update>
 </mapper>

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

              ,0 schoolmaxscore,0 schoolavgscore,0 goal,0 nextgoal
         </if>
         <if test="showrank==1">
-            ,rs.score,rs.bzscore,rs.classrank,rs.classrankpre,rs.classmaxscore,rs.classavgscore,rs.schoolrank
+            ,rs.score,rs.bzscore,0 classrank,0 classrankpre,rs.classmaxscore,rs.classavgscore,0 schoolrank
+            ,rs.schoolmaxscore,rs.schoolavgscore,0 goal,0 nextgoal
+        </if>
+        <if test="showrank==2">
+            ,rs.score,rs.bzscore,rs.classrank,rs.classrankpre,rs.classmaxscore,rs.classavgscore,0 schoolrank
+            ,rs.schoolmaxscore,rs.schoolavgscore,0 goal,0 nextgoal
+        </if>
+        <if test="showrank==3">
+            ,rs.score,rs.bzscore,0 classrank,0 classrankpre,rs.classmaxscore,rs.classavgscore,rs.schoolrank
             ,rs.schoolmaxscore,rs.schoolavgscore,rs.goal,rs.nextgoal
         </if>
         ,eps.device,eps.submittype,eps.endtime
             ,0 schoolmaxscore,0 schoolavgscore,0 goal,0 nextgoal
         </if>
         <if test="showrank==1">
-            ,rs.score,rs.bzscore,rs.classrank,rs.classrankpre,rs.classmaxscore,rs.classavgscore,rs.schoolrank
+            ,rs.score,rs.bzscore,0 classrank,0 classrankpre,rs.classmaxscore,rs.classavgscore,0 schoolrank
+            ,rs.schoolmaxscore,rs.schoolavgscore,0 goal,0 nextgoal
+        </if>
+        <if test="showrank==2">
+            ,rs.score,rs.bzscore,rs.classrank,rs.classrankpre,rs.classmaxscore,rs.classavgscore,0 schoolrank
+            ,rs.schoolmaxscore,rs.schoolavgscore,0 goal,0 nextgoal
+        </if>
+        <if test="showrank==3">
+            ,rs.score,rs.bzscore,0 classrank,0 classrankpre,rs.classmaxscore,rs.classavgscore,rs.schoolrank
             ,rs.schoolmaxscore,rs.schoolavgscore,rs.goal,rs.nextgoal
         </if>
         from e_rstudent rs where rs.examid=#{examid} and rs.studentid=#{studentid} and rs.subjectid=#{subjectid}
             ,0 stuscore,0 stusrate,0 gradescore,0 gradesrate,0 gradeavgscore
             ,0 classscore,0 classsrate,0 classavgscore
         </if>
-        <if test="showrank==1">
+        <if test="showrank!=0">
             ,sp.stuscore,sp.stusrate,cp.gradescore,cp.gradesrate,cp.gradeavgscore
             ,cp.classscore,cp.classsrate,cp.classavgscore
         </if>
             ,0 stuscore,0 stusrate,0 gradescore,0 gradeavgscore,0 gradesrate
             ,0 classscore,0 classavgscore,0 classsrate
         </if>
-        <if test="showrank==1">
+        <if test="showrank!=0">
             ,sc.stuscore,sc.stusrate,cc.gradescore,cc.gradeavgscore,cc.gradesrate
             ,cc.classscore,cc.classavgscore,cc.classsrate
         </if>
             ,0 stuscore,0 stusrate,0 gradescore,0 gradesrate,0 gradeavgscore
             ,0 classscore,0 classsrate,0 classavgscore
         </if>
-        <if test="showrank==1">
+        <if test="showrank!=0">
             ,st.stuscore,st.stusrate,ct.gradescore,ct.gradesrate,ct.gradeavgscore
             ,ct.classscore,ct.classsrate,ct.classavgscore
         </if>
             ,0 stuscore,0 classscore,0 classsrate,0 gradescore,0 gradesrate
             ,0 gradeavgscore,0 classavgscore
         </if>
-        <if test="showrank==1">
+        <if test="showrank!=0">
             ,sq.stuscore,cq.classscore,cq.classsrate,cq.gradescore,cq.gradesrate
             ,cq.gradeavgscore,cq.classavgscore
         </if>
         <if test="showrank==0">
             ,0 classscore,0 classsrate,0 gradescore,0 gradesrate,0 classavgscore,0 gradeavgscore
         </if>
-        <if test="showrank==1">
+        <if test="showrank!=0">
             ,cq.classscore,cq.classsrate,cq.gradescore,cq.gradesrate,cq.classavgscore,cq.gradeavgscore
         </if>
         from e_rclass_question cq
     </select>
     <select id="listSubjectQuestionsStuScore" resultType="java.util.Map">
         select sq.stuscore,sq.qscore,sq.questionid squestionid
-        <!--<if test="showrank==0">-->
-        <!--    ,0 stuscore-->
-        <!--</if>-->
-        <!--<if test="showrank==1">-->
-        <!--    ,sq.stuscore-->
-        <!--</if>-->
         from e_paper_student_question sq
         left join t_question q on sq.questionid=q.questionid
         where sq.studentid=#{studentid} and sq.epid=#{epid} and (q.questionid=#{questionid} or q.questionpid=#{questionid})
         <if test="showrank==0">
             ,0 stuscore,0 classavgscore,0 gradeavgscore
         </if>
-        <if test="showrank==1">
+        <if test="showrank!=0">
             ,sq.stuscore,cq.classavgscore,cq.gradeavgscore
         </if>
         from e_paper_student_question sq left join t_question q on sq.questionid=q.questionid
         <if test="showrank==0">
             ,0 stuscore,0 classavgscore,0 gradeavgscore
         </if>
-        <if test="showrank==1">
+        <if test="showrank!=0">
             ,sq.stuscore,cq.classavgscore,cq.gradeavgscore
         </if>
         from e_paper_student_question sq left join e_rclass_question cq on sq.eptqid=cq.eptqid and sq.classid=cq.classid
         </collection>
     </resultMap>
     <select id="listStudentSubjectErrorQues" resultMap="listStudentSubjectErrorQues">
-        <if test="showrank==1">
+        <if test="showrank!=0">
         select sq.subjectid,st.subjectname,p.ptype,sq.epsqid,sq.eptqid,q.questionid,q.qlevel,q.questionpid
         from e_paper_student_question sq
         left join t_question q on q.questionid=sq.questionid